---

yaml --- r: 107017 b: refs/heads/master c: bd673c7 h: refs/heads/master i: 107015: 61fec91 v: v3
git-mirror · Jul 30, 2008 · 4f04d23 · 4f04d23
1 parent ff698d1
commit 4f04d23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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