diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-19 03:23:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-19 03:23:07 -0400 |
| commit | a8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c (patch) | |
| tree | fa3c8e81ffa64798e85425cf139fdd6ba3fd7963 /arch/sparc64/mm/init.c | |
| parent | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (diff) | |
| parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) | |
Merge branch 'linus' into x86/pat
Diffstat (limited to 'arch/sparc64/mm/init.c')
| -rw-r--r-- | arch/sparc64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index a9828d748e2c..3c7b9471eafb 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -768,7 +768,7 @@ static void __init find_ramdisk(unsigned long phys_base) | |||
| 768 | initrd_start = ramdisk_image; | 768 | initrd_start = ramdisk_image; |
| 769 | initrd_end = ramdisk_image + sparc_ramdisk_size; | 769 | initrd_end = ramdisk_image + sparc_ramdisk_size; |
| 770 | 770 | ||
| 771 | lmb_reserve(initrd_start, initrd_end); | 771 | lmb_reserve(initrd_start, sparc_ramdisk_size); |
| 772 | 772 | ||
| 773 | initrd_start += PAGE_OFFSET; | 773 | initrd_start += PAGE_OFFSET; |
| 774 | initrd_end += PAGE_OFFSET; | 774 | initrd_end += PAGE_OFFSET; |