From 9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 20 Oct 2008 11:37:58 +0900 Subject: sh: Fix up some merge damage. Signed-off-by: Paul Mundt --- arch/sh/include/asm/elf.h | 2 ++ arch/sh/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/sh') diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index f7d0b8e6aa8..9eb9036a1bd 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 diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 836e80d5cb9..5767f0a84cd 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -282,7 +282,7 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) printk("initrd extends beyond end of memory " "(0x%08lx > 0x%08lx)\ndisabling initrd\n", initrd_start_phys + INITRD_SIZE, - PFN_PHYS(max_low_pfn)); + (unsigned long)PFN_PHYS(max_low_pfn)); initrd_start = 0; } } -- cgit v1.2.3