lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Fix up broken 32-bit initrd support.

Browse Source 
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Stuart Menefy
2008-09-05 16:14:17 +09:00
committed by Paul Mundt
parent c6feb6142c
commit 28d6e52cf7
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,17 +249,18 @@ void __init setup_bootmem_allocator(unsigned long free_pfn)
ROOT_DEV = Root_RAM0; ROOT_DEV = Root_RAM0;
if (LOADER_TYPE && INITRD_START) { if (LOADER_TYPE && INITRD_START) {
if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { unsigned long initrd_start_phys = INITRD_START + __MEMORY_START;
reserve_bootmem(INITRD_START + __MEMORY_START,
INITRD_SIZE, BOOTMEM_DEFAULT); if (initrd_start_phys + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) {
initrd_start = INITRD_START + PAGE_OFFSET + reserve_bootmem(initrd_start_phys, INITRD_SIZE,
__MEMORY_START; BOOTMEM_DEFAULT);
initrd_start = (unsigned long)__va(initrd_start_phys);
initrd_end = initrd_start + INITRD_SIZE; initrd_end = initrd_start + INITRD_SIZE;
} else { } else {
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 + INITRD_SIZE, initrd_start_phys + INITRD_SIZE,
max_low_pfn << PAGE_SHIFT); PFN_PHYS(max_low_pfn));
initrd_start = 0; initrd_start = 0;
} }
} }