---

yaml --- r: 116179 b: refs/heads/master c: 9a19eb2 h: refs/heads/master i: 116177: 3e04736 116175: a829517 v: v3
git-mirror · Oct 20, 2008 · 085f8d5 · 085f8d5
1 parent 452f267
commit 085f8d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d
+refs/heads/master: 9a19eb2a6607f2f6329efb3c4637fe23afae2cd7
diff --git a/trunk/arch/sh/include/asm/elf.h b/trunk/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/trunk/arch/sh/kernel/setup.c b/trunk/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;
 		}
 	}