projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ac4c94
)
[SPARC32]: Fix bogus ramdisk image location check.
author
Mark Fortescue
<
[email protected]
>
Wed, 15 Aug 2007 01:22:03 +0000
(18:22 -0700)
committer
David S. Miller
<
[email protected]
>
Wed, 15 Aug 2007 01:22:03 +0000
(18:22 -0700)
This mirrors sparc64 commit
715a0ecc29c850d2b2f76e1803d3f22cd5a0ac0d
sparc_ramdisk_image should always be decremented by KERNBASE.
Signed-off-by: Mark Fortescue <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
arch/sparc/mm/init.c
patch
|
blob
|
history
diff --git
a/arch/sparc/mm/init.c
b/arch/sparc/mm/init.c
index a1bef07755a920076d186880269af56f5f9348db..c13e6cd279ac0bae8ad49043b9c11f73310f349e 100644
(file)
--- a/
arch/sparc/mm/init.c
+++ b/
arch/sparc/mm/init.c
@@
-206,8
+206,7
@@
unsigned long __init bootmem_init(unsigned long *pages_avail)
#ifdef CONFIG_BLK_DEV_INITRD
/* Now have to check initial ramdisk, so that bootmap does not overwrite it */
if (sparc_ramdisk_image) {
- if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)
- sparc_ramdisk_image -= KERNBASE;
+ sparc_ramdisk_image -= KERNBASE;
initrd_start = sparc_ramdisk_image + phys_base;
initrd_end = initrd_start + sparc_ramdisk_size;
if (initrd_end > end_of_phys_memory) {