From f335faa05925e878eb50b822af3ea4961149bf76 Mon Sep 17 00:00:00 2001 From: Yoshinori Sato Date: Wed, 30 Mar 2005 16:39:25 -0800 Subject: [PATCH] nommu.c build error fix - Argument addition of security_file_mmap. - Because in_gate_area_no_task undefined with CONFIG_KALLSYM=y, add it. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/nommu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/nommu.c b/mm/nommu.c index a9cf49a0e0350..f613db39e8474 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -396,6 +396,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned int vm_flags; void *result; int ret, membacked; + unsigned long reqprot = prot; /* do the simple checks first */ if (flags & MAP_FIXED || addr) { @@ -506,7 +507,7 @@ unsigned long do_mmap_pgoff(struct file *file, } /* allow the security API to have its say */ - ret = security_file_mmap(file, prot, flags); + ret = security_file_mmap(file, reqprot, prot, flags); if (ret) return ret; @@ -1063,3 +1064,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin) return -ENOMEM; } +int in_gate_area_no_task(unsigned long addr) +{ + return 0; +} -- cgit 1.2.3-korg