summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-10-20 11:37:58 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-10-20 11:37:58 +0900
commit9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 (patch)
treec730bca14d2c6ea8b5e8778e15bd1c219c554d4b
parent4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (diff)
sh: Fix up some merge damage.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/include/asm/elf.h2
-rw-r--r--arch/sh/kernel/setup.c2
2 files changed, 3 insertions, 1 deletions
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;
}
}