diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 06:09:29 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 06:09:29 (GMT) |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /arch/x86/include/asm/elf.h | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
| download | linux-fsl-qoriq-2bb4646fce8d09916b351d1a62f98db7cec6fc41.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/x86/include/asm/elf.h')
| -rw-r--r-- | arch/x86/include/asm/elf.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h index b4501ee..f2ad216 100644 --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h @@ -170,10 +170,7 @@ static inline void elf_common_init(struct thread_struct *t, } #define ELF_PLAT_INIT(_r, load_addr) \ -do { \ - elf_common_init(¤t->thread, _r, 0); \ - clear_thread_flag(TIF_IA32); \ -} while (0) + elf_common_init(¤t->thread, _r, 0) #define COMPAT_ELF_PLAT_INIT(regs, load_addr) \ elf_common_init(¤t->thread, regs, __USER_DS) @@ -181,14 +178,8 @@ do { \ void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp); #define compat_start_thread start_thread_ia32 -#define COMPAT_SET_PERSONALITY(ex) \ -do { \ - if (test_thread_flag(TIF_IA32)) \ - clear_thread_flag(TIF_ABI_PENDING); \ - else \ - set_thread_flag(TIF_ABI_PENDING); \ - current->personality |= force_personality32; \ -} while (0) +void set_personality_ia32(void); +#define COMPAT_SET_PERSONALITY(ex) set_personality_ia32() #define COMPAT_ELF_PLATFORM ("i686") |