| From 4792adbac9eb41cea77a45ab76258ea10d411173 Mon Sep 17 00:00:00 2001 |
| From: Jon Tollefson <kniht@us.ibm.com> |
| Date: Tue, 21 Oct 2008 15:27:36 +0000 |
| Subject: powerpc: Don't use a 16G page if beyond mem= limits |
| |
| From: Jon Tollefson <kniht@us.ibm.com> |
| |
| commit 4792adbac9eb41cea77a45ab76258ea10d411173 upstream |
| |
| If mem= is used on the boot command line to limit memory then the memory block where a 16G page resides may not be available. |
| |
| Thanks to Michael Ellerman for finding the problem. |
| |
| Signed-off-by: Jon Tollefson <kniht@linux.vnet.ibm.com> |
| Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/powerpc/mm/hash_utils_64.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/arch/powerpc/mm/hash_utils_64.c |
| +++ b/arch/powerpc/mm/hash_utils_64.c |
| @@ -381,8 +381,10 @@ static int __init htab_dt_scan_hugepage_ |
| printk(KERN_INFO "Huge page(16GB) memory: " |
| "addr = 0x%lX size = 0x%lX pages = %d\n", |
| phys_addr, block_size, expected_pages); |
| - lmb_reserve(phys_addr, block_size * expected_pages); |
| - add_gpage(phys_addr, block_size, expected_pages); |
| + if (phys_addr + (16 * GB) <= lmb_end_of_DRAM()) { |
| + lmb_reserve(phys_addr, block_size * expected_pages); |
| + add_gpage(phys_addr, block_size, expected_pages); |
| + } |
| return 0; |
| } |
| |
