Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 2b16b00a5b115be2c13897aab5763562312ecb84..989e2e9af5c3adc42cb250409a4b7249288e0df7 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -639,7 +639,7 @@ static int validate_mmap_request(struct file *file,
        }
 
        /* allow the security API to have its say */
-       ret = security_file_mmap(file, reqprot, prot, flags);
+       ret = security_file_mmap(file, reqprot, prot, flags, addr, 0);
        if (ret < 0)
                return ret;