Merge branch 'master' into next

2010-05-06 10:56:07 +10:00
parent 4e5d6f7ec3 7ebd467551
commit 0ffbe2699c
5014 changed files with 37859 additions and 10471 deletions
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -36,6 +36,7 @@
 #include <linux/personality.h>
 #include <linux/ptrace.h>
 #include <linux/fs_struct.h>
+#include <linux/gfp.h>

 #include <linux/compat.h>
 #include <linux/syscalls.h>
@@ -1086,7 +1087,7 @@ DECLARE_RWSEM(uts_sem);

 #ifdef COMPAT_UTS_MACHINE
 #define override_architecture(name) \
-	(current->personality == PER_LINUX32 && \
+	(personality(current->personality) == PER_LINUX32 && \
 	 copy_to_user(name->machine, COMPAT_UTS_MACHINE, \
 		      sizeof(COMPAT_UTS_MACHINE)))
 #else