projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initrd: cast `initrd_start' to `void *'
[deliverable/linux.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index 20fdc9884b77184f1b77d5ca857305c8a0d8dd21..9c3b68b86ca055ebd4d5236cf6217b9b35e7f877 100644
(file)
--- a/
init/main.c
+++ b/
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 &&
#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",
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
initrd_start = 0;
}
#endif
This page took
0.101787 seconds
and
5
git commands to generate.