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

sh: Fix up some merge damage.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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 "
"(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;
}
}