From cf8e18ea2f8be26e8f9e44ed677d25f558ca301a Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Sat, 2 Mar 2013 20:15:28 +0100 Subject: parisc: fix redefinition of SET_PERSONALITY 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 --- arch/parisc/kernel/binfmt_elf32.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/parisc/kernel/binfmt_elf32.c') diff --git a/arch/parisc/kernel/binfmt_elf32.c b/arch/parisc/kernel/binfmt_elf32.c index f61692d2b557..00dc66f9c2ba 100644 --- 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; \ -- cgit v1.2.3