diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /arch/sparc64/mm/init.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/sparc64/mm/init.c')
| -rw-r--r-- | arch/sparc64/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index dcba4e6ab570..09cb7fccc03a 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -920,8 +920,7 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, | |||
| 920 | if (sparc_ramdisk_image || sparc_ramdisk_image64) { | 920 | if (sparc_ramdisk_image || sparc_ramdisk_image64) { |
| 921 | unsigned long ramdisk_image = sparc_ramdisk_image ? | 921 | unsigned long ramdisk_image = sparc_ramdisk_image ? |
| 922 | sparc_ramdisk_image : sparc_ramdisk_image64; | 922 | sparc_ramdisk_image : sparc_ramdisk_image64; |
| 923 | if (ramdisk_image >= (unsigned long)_end - 2 * PAGE_SIZE) | 923 | ramdisk_image -= KERNBASE; |
| 924 | ramdisk_image -= KERNBASE; | ||
| 925 | initrd_start = ramdisk_image + phys_base; | 924 | initrd_start = ramdisk_image + phys_base; |
| 926 | initrd_end = initrd_start + sparc_ramdisk_size; | 925 | initrd_end = initrd_start + sparc_ramdisk_size; |
| 927 | if (initrd_end > end_of_phys_memory) { | 926 | if (initrd_end > end_of_phys_memory) { |