From: Paul Mackerras <paulus@samba.org>
Date: Mon, 7 Nov 2005 03:42:09 +0000 (+1100)
Subject: Merge ../linux-2.6
X-Git-Tag: v2.6.15-rc1~421^2~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6135234550ed89a6fd0e8cb229633967e41d649;p=linux-2.6

Merge ../linux-2.6
---

c6135234550ed89a6fd0e8cb229633967e41d649
diff --cc arch/powerpc/mm/hash_utils_64.c
index b6970c96d9,b2f3dbca69..37273f518a
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@@ -190,9 -404,15 +403,9 @@@ void __init htab_initialize(void
  	 * Calculate the required size of the htab.  We want the number of
  	 * PTEGs to equal one half the number of real pages.
  	 */ 
- 	htab_size_bytes = get_hashtable_size();
+ 	htab_size_bytes = htab_get_table_size();
  	pteg_count = htab_size_bytes >> 7;
  
 -	/* For debug, make the HTAB 1/8 as big as it normally would be. */
 -	ifppcdebug(PPCDBG_HTABSIZE) {
 -		pteg_count >>= 3;
 -		htab_size_bytes = pteg_count << 7;
 -	}
 -
  	htab_hash_mask = pteg_count - 1;
  
  	if (systemcfg->platform & PLATFORM_LPAR) {