diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-19 22:17:52 -0400 |
| commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
| tree | db3d7519932549bf528f5b8e4cb8350356cd544d /arch/sh/include | |
| parent | 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/elf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index 4da3a0b10911..f7d0b8e6aa84 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h | |||
| @@ -197,8 +197,6 @@ do { \ | |||
| 197 | } while (0) | 197 | } while (0) |
| 198 | #endif | 198 | #endif |
| 199 | 199 | ||
| 200 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT) | ||
| 201 | |||
| 202 | #ifdef CONFIG_VSYSCALL | 200 | #ifdef CONFIG_VSYSCALL |
| 203 | /* vDSO has arch_setup_additional_pages */ | 201 | /* vDSO has arch_setup_additional_pages */ |
| 204 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES | 202 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES |