projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1905b77)
parisc: fix redefinition of SET_PERSONALITY
authorHelge Deller <deller@gmx.de>
Sat, 2 Mar 2013 19:15:28 +0000 (20:15 +0100)
committerHelge Deller <deller@gmx.de>
Sat, 2 Mar 2013 19:15:28 +0000 (20:15 +0100)
commit e72837e3e7bae3f182c4ac63c9424e86f1158dd0 introduced
a default SET_PERSONALITY() in include/linux/elf.h.
This breaks with our own SET_PERSONALITY define for
32bit userspace on 64bit kernel.

Signed-off-by: Helge Deller <deller@gmx.de>
arch/parisc/kernel/binfmt_elf32.c patch | blob | blame | history

diff --git a/arch/parisc/kernel/binfmt_elf32.c b/arch/parisc/kernel/binfmt_elf32.c
index f61692d2b557edcc51691148182b3750b373ccb9..00dc66f9c2ba0a41fd6774fc709d9b62152e4e5f 100644 (file)
--- a/arch/parisc/kernel/binfmt_elf32.c
+++ b/arch/parisc/kernel/binfmt_elf32.c
@@ -85,6 +85,7 @@ struct elf_prpsinfo32
  * could set a processor dependent flag in the thread_struct.
  */
 
+#undef SET_PERSONALITY
 #define SET_PERSONALITY(ex) \
        set_thread_flag(TIF_32BIT); \
        current->thread.map_base = DEFAULT_MAP_BASE32; \