Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=efb896300cc9215f60bb4f7f77f93541ab9f1713
Commit:     efb896300cc9215f60bb4f7f77f93541ab9f1713
Parent:     195f7fd0a7e2b3179d52aa8ed6de3637203946c6
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 20 15:52:18 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Aug 20 23:40:01 2007 -0700

    [SPARC32]: Revert f642b263800e6e57c377d630be6d2a999683b579.
    
    This causes boot failures for some people.
    It looks like in fact that some SILO provided
    ramdisk images should not be KERNBASE normalized.
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 arch/sparc/mm/init.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c
index c13e6cd..a1bef07 100644
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -206,7 +206,8 @@ 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) {
-               sparc_ramdisk_image -= KERNBASE;
+               if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)
+                       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) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to