diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:37:58 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:37:58 -0400 |
| commit | 9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 (patch) | |
| tree | c730bca14d2c6ea8b5e8778e15bd1c219c554d4b /arch/sh/include | |
| parent | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (diff) | |
sh: Fix up some merge damage.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/elf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index f7d0b8e6aa84..9eb9036a1bdc 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h | |||
| @@ -197,6 +197,8 @@ do { \ | |||
| 197 | } while (0) | 197 | } while (0) |
| 198 | #endif | 198 | #endif |
| 199 | 199 | ||
| 200 | #define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT) | ||
| 201 | |||
| 200 | #ifdef CONFIG_VSYSCALL | 202 | #ifdef CONFIG_VSYSCALL |
| 201 | /* vDSO has arch_setup_additional_pages */ | 203 | /* vDSO has arch_setup_additional_pages */ |
| 202 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES | 204 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES |