sh: Fix up some merge damage.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Oct 20, 2008 · 9a19eb2 · 9a19eb2
1 parent 4cb40f7
commit 9a19eb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 		}
 	}