Merge branch 'master' into next
James Morris [Mon, 23 Mar 2009 23:52:46 +0000 (10:52 +1100)]
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
fs/compat.c
fs/exec.c
fs/inode.c
include/linux/sched.h
ipc/shm.c
kernel/user.c
mm/mmap.c
mm/shmem.c
security/smack/smack_lsm.c

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc fs/compat.c
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/inode.c
Simple merge
Simple merge
diff --cc ipc/shm.c
Simple merge
diff --cc kernel/user.c
Simple merge
diff --cc mm/mmap.c
+++ b/mm/mmap.c
@@@ -1053,12 -1049,8 +1050,11 @@@ unsigned long do_mmap_pgoff(struct fil
        error = security_file_mmap(file, reqprot, prot, flags, addr, 0);
        if (error)
                return error;
 +      error = ima_file_mmap(file, prot);
 +      if (error)
 +              return error;
  
-       return mmap_region(file, addr, len, flags, vm_flags, pgoff,
-                          accountable);
+       return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
  
diff --cc mm/shmem.c
Simple merge
Simple merge