summaryrefslogtreecommitdiffstats
path: root/arch/sh/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-10-20 04:37:58 +0200
committerPaul Mundt <lethal@linux-sh.org>2008-10-20 04:37:58 +0200
commit9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 (patch)
treec730bca14d2c6ea8b5e8778e15bd1c219c554d4b /arch/sh/include
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
downloadlinux-9a19eb2a6607f2f6329efb3c4637fe23afae2cd7.tar.xz
linux-9a19eb2a6607f2f6329efb3c4637fe23afae2cd7.zip
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.h2
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 { \
} 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