Merge branch 'master' into next

[linux-drm-fsl-dcu.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index eb1ec5c7f03bd37a969a3e9eabdee611e9ebde95..0d36d889c74d277799ae409f396a49c6d2c15415 100644 (file)
--- 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