summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2013-02-09 23:11:46 (GMT)
committerHelge Deller <deller@gmx.de>2013-02-20 21:55:26 (GMT)
commit330cb32520239a6ce81010df24c1e2d4ba67e7b5 (patch)
treef2be3e5db5c23423bcdb5f99809b376c7eb4abbb
parent24084747df3474bbdeb0880d26afe82c42161a6b (diff)
downloadlinux-fsl-qoriq-330cb32520239a6ce81010df24c1e2d4ba67e7b5.tar.xz
parisc: fix personality on 32bit kernel
Process personality is stored together with other flags like UNAME26 in an integer variable. Overwriting this value with PER_LINUX drops all other existing flags and as such broke tools like the uname26 tool. Actually this was only broken on 32bit kernels, since for 32bit-ELF binaries on 64-bit kernels the SET_PERSONALITY macro from arch/parisc/kernel/binfmt_elf32.c is used which does not modifies the personality value at all (which is wrong as long as we don't run HPUX binaries or similiar). Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--arch/parisc/include/asm/elf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
index 19f6cb1..ad2b503 100644
--- a/arch/parisc/include/asm/elf.h
+++ b/arch/parisc/include/asm/elf.h
@@ -247,7 +247,7 @@ typedef unsigned long elf_greg_t;
#define ELF_PLATFORM ("PARISC\0")
#define SET_PERSONALITY(ex) \
- current->personality = PER_LINUX; \
+ set_personality((current->personality & ~PER_MASK) | PER_LINUX); \
current->thread.map_base = DEFAULT_MAP_BASE; \
current->thread.task_size = DEFAULT_TASK_SIZE \