diff options
| author | Helge Deller <deller@gmx.de> | 2013-03-02 14:15:28 -0500 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-03-02 14:15:28 -0500 |
| commit | cf8e18ea2f8be26e8f9e44ed677d25f558ca301a (patch) | |
| tree | 34d2c70300716ce4b43917388765c72c7545803e | |
| parent | 1905b7716cb61feeca79da320be4d8968495bb31 (diff) | |
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 <deller@gmx.de>
| -rw-r--r-- | arch/parisc/kernel/binfmt_elf32.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 | |||
| 85 | * could set a processor dependent flag in the thread_struct. | 85 | * could set a processor dependent flag in the thread_struct. |
| 86 | */ | 86 | */ |
| 87 | 87 | ||
| 88 | #undef SET_PERSONALITY | ||
| 88 | #define SET_PERSONALITY(ex) \ | 89 | #define SET_PERSONALITY(ex) \ |
| 89 | set_thread_flag(TIF_32BIT); \ | 90 | set_thread_flag(TIF_32BIT); \ |
| 90 | current->thread.map_base = DEFAULT_MAP_BASE32; \ | 91 | current->thread.map_base = DEFAULT_MAP_BASE32; \ |