From 4b0fb7d80aa4800bcae6b07705fcb31a4fa48914 Mon Sep 17 00:00:00 2001 From: Jon Tollefson Date: Tue, 21 Oct 2008 15:27:36 +0000 Subject: [PATCH] --- yaml --- r: 116967 b: refs/heads/master c: 4792adbac9eb41cea77a45ab76258ea10d411173 h: refs/heads/master i: 116965: 8e200e7314a52a74b15c472580c100040e506b09 116963: a7bdcf2f9417e047cc2cd4af90c0cbd538607505 116959: c71ae24c50f7ff464db5f8be02d57d40720c1197 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/hash_utils_64.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b2758627458c..2aadbed1f678 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71773f0337bee8a3701aaaec22581c18a5f44679 +refs/heads/master: 4792adbac9eb41cea77a45ab76258ea10d411173 diff --git a/trunk/arch/powerpc/mm/hash_utils_64.c b/trunk/arch/powerpc/mm/hash_utils_64.c index 5c64af174752..8d5b4758c13a 100644 --- a/trunk/arch/powerpc/mm/hash_utils_64.c +++ b/trunk/arch/powerpc/mm/hash_utils_64.c @@ -382,8 +382,10 @@ static int __init htab_dt_scan_hugepage_blocks(unsigned long node, 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; } #endif /* CONFIG_HUGETLB_PAGE */