From 4f04d23d85b871cbf5c6a99d2e182493cf21f684 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 29 Jul 2008 22:33:36 -0700 Subject: [PATCH] --- yaml --- r: 107017 b: refs/heads/master c: bd673c7c3b1681dbfabab0062e67398dadf806af h: refs/heads/master i: 107015: 61fec917fdc8e9c6a15f045ef1d9c9bb05184cb6 v: v3 --- [refs] | 2 +- trunk/init/main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9bd0770d15f7..7831e4d54a23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06ac667903ebea8191d4f7e7fa4e0936161e25fe +refs/heads/master: bd673c7c3b1681dbfabab0062e67398dadf806af diff --git a/trunk/init/main.c b/trunk/init/main.c index 20fdc9884b77..9c3b68b86ca0 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -635,10 +635,11 @@ asmlinkage void __init start_kernel(void) #ifdef CONFIG_BLK_DEV_INITRD if (initrd_start && !initrd_below_start_ok && - page_to_pfn(virt_to_page(initrd_start)) < min_low_pfn) { + page_to_pfn(virt_to_page((void *)initrd_start)) < min_low_pfn) { printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - " "disabling it.\n", - page_to_pfn(virt_to_page(initrd_start)), min_low_pfn); + page_to_pfn(virt_to_page((void *)initrd_start)), + min_low_pfn); initrd_start = 0; } #endif