LSM: imbed ima calls in the security hooks

[net-next-2.6.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 73f5e4b640104f356c2df4956db6324ebe28b327..292ddc3cef9cba4bf58053da23bfcae5a2e9de02 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -20,7 +20,6 @@
 #include <linux/fs.h>
 #include <linux/personality.h>
 #include <linux/security.h>
-#include <linux/ima.h>
 #include <linux/hugetlb.h>
 #include <linux/profile.h>
 #include <linux/module.h>
@@ -1059,9 +1058,6 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
        }
 
        error = security_file_mmap(file, reqprot, prot, flags, addr, 0);
-       if (error)
-               return error;
-       error = ima_file_mmap(file, prot);
        if (error)
                return error;