forked from Minki/linux
[SPARC64]: Kill bogus check from bootmem_init().
There is an ancient and totally incorrect sanity check being done on the ramdisk location. The check assumes that the kernel is always loaded to physical address zero, which is wrong. It was trying to validate the ramdisk value by saying that if it fell within the kernel image address range it must be wrong. Anyways, kill this because it actually creates problems. The 'ramdisk_image' should always be adjusted down by KERNBASE. SILO can easily put the ramdisk in a location which causes this test to trigger, breaking things. [ Based almost entirely upon a patch from Ben Collins. ] Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e531dcc568
commit
715a0ecc29
@ -920,8 +920,7 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
|
|||||||
if (sparc_ramdisk_image || sparc_ramdisk_image64) {
|
if (sparc_ramdisk_image || sparc_ramdisk_image64) {
|
||||||
unsigned long ramdisk_image = sparc_ramdisk_image ?
|
unsigned long ramdisk_image = sparc_ramdisk_image ?
|
||||||
sparc_ramdisk_image : sparc_ramdisk_image64;
|
sparc_ramdisk_image : sparc_ramdisk_image64;
|
||||||
if (ramdisk_image >= (unsigned long)_end - 2 * PAGE_SIZE)
|
ramdisk_image -= KERNBASE;
|
||||||
ramdisk_image -= KERNBASE;
|
|
||||||
initrd_start = ramdisk_image + phys_base;
|
initrd_start = ramdisk_image + phys_base;
|
||||||
initrd_end = initrd_start + sparc_ramdisk_size;
|
initrd_end = initrd_start + sparc_ramdisk_size;
|
||||||
if (initrd_end > end_of_phys_memory) {
|
if (initrd_end > end_of_phys_memory) {
|
||||||
|
Loading…
Reference in New Issue
Block a user