commit | 9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 | [log] [tgz] |
---|---|---|
author | Paul Mundt <lethal@linux-sh.org> | Mon Oct 20 11:37:58 2008 +0900 |
committer | Paul Mundt <lethal@linux-sh.org> | Mon Oct 20 11:37:58 2008 +0900 |
tree | c730bca14d2c6ea8b5e8778e15bd1c219c554d4b | |
parent | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d [diff] [blame] |
sh: Fix up some merge damage. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index f7d0b8e..9eb9036 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h
@@ -197,6 +197,8 @@ } while (0) #endif +#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT) + #ifdef CONFIG_VSYSCALL /* vDSO has arch_setup_additional_pages */ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES