aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh')
-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 f7d0b8e6aa84..9eb9036a1bdc 100644
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -197,6 +197,8 @@ do { \
197} while (0) 197} while (0)
198#endif 198#endif
199 199
200#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
201
200#ifdef CONFIG_VSYSCALL 202#ifdef CONFIG_VSYSCALL
201/* vDSO has arch_setup_additional_pages */ 203/* vDSO has arch_setup_additional_pages */
202#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 204#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 836e80d5cb9f..5767f0a84cd7 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)
282 printk("initrd extends beyond end of memory " 282 printk("initrd extends beyond end of memory "
283 "(0x%08lx > 0x%08lx)\ndisabling initrd\n", 283 "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
284 initrd_start_phys + INITRD_SIZE, 284 initrd_start_phys + INITRD_SIZE,
285 PFN_PHYS(max_low_pfn)); 285 (unsigned long)PFN_PHYS(max_low_pfn));
286 initrd_start = 0; 286 initrd_start = 0;
287 } 287 }
288 } 288 }