diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-26 15:07:37 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-26 15:07:37 +1000 |
| commit | 8e377575721f1c0b2114b68addc30535a77c1f85 (patch) | |
| tree | 564a76d01e12d5c1c18780b276ac85a93b1e56c0 /init | |
| parent | db0e2fcd6819f8a16452950ae35b0f5a48443f33 (diff) | |
| parent | c9e9f523d3058280a71f12840056b3a98780769c (diff) | |
Merge branch 'quilt/m68k'
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 51f6b5fe52d2..3ffa681b2507 100644 --- a/init/main.c +++ b/init/main.c @@ -636,9 +636,10 @@ asmlinkage void __init start_kernel(void) #ifdef CONFIG_BLK_DEV_INITRD if (initrd_start && !initrd_below_start_ok && - initrd_start < min_low_pfn << PAGE_SHIFT) { + page_to_pfn(virt_to_page(initrd_start)) < min_low_pfn) { printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - " - "disabling it.\n",initrd_start,min_low_pfn << PAGE_SHIFT); + "disabling it.\n", + page_to_pfn(virt_to_page(initrd_start)), min_low_pfn); initrd_start = 0; } #endif |