diff options
| author | Helge Deller <deller@gmx.de> | 2013-03-02 20:15:28 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-03-02 20:15:28 +0100 |
| commit | cf8e18ea2f8be26e8f9e44ed677d25f558ca301a (patch) | |
| tree | 34d2c70300716ce4b43917388765c72c7545803e /arch/parisc | |
| parent | 1905b7716cb61feeca79da320be4d8968495bb31 (diff) | |
| download | linux-3.10-cf8e18ea2f8be26e8f9e44ed677d25f558ca301a.tar.gz linux-3.10-cf8e18ea2f8be26e8f9e44ed677d25f558ca301a.tar.bz2 linux-3.10-cf8e18ea2f8be26e8f9e44ed677d25f558ca301a.zip | |
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>
Diffstat (limited to 'arch/parisc')
| -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 f61692d2b55..00dc66f9c2b 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; \ |