openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sh: Fix up some merge damage. 

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2008-10-20 11:37:58 +09:00
parent 4cb40f795a
commit 9a19eb2a66
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/include/asm/elf.h
View File

@ -197,6 +197,8 @@ do { \
} while (0) } while (0)
#endif #endif
#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
#ifdef CONFIG_VSYSCALL #ifdef CONFIG_VSYSCALL
/* vDSO has arch_setup_additional_pages */ /* vDSO has arch_setup_additional_pages */
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES #define ARCH_HAS_SETUP_ADDITIONAL_PAGES

2
arch/sh/kernel/setup.c
View File

@ -282,7 +282,7 @@ void __init setup_bootmem_allocator(unsigned long free_pfn)
printk("initrd extends beyond end of memory " printk("initrd extends beyond end of memory "
"(0x%08lx > 0x%08lx)\ndisabling initrd\n", "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
initrd_start_phys + INITRD_SIZE, initrd_start_phys + INITRD_SIZE,
PFN_PHYS(max_low_pfn)); (unsigned long)PFN_PHYS(max_low_pfn));
initrd_start = 0; initrd_start = 0;
} }
} }