Merge ../linux-2.6
Paul Mackerras [Mon, 7 Nov 2005 03:42:09 +0000 (14:42 +1100)]
1  2 
arch/powerpc/kernel/process.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/init_64.c
arch/powerpc/mm/pgtable_64.c
arch/powerpc/platforms/iseries/setup.c
arch/powerpc/platforms/pseries/lpar.c
arch/ppc64/kernel/prom.c
include/asm-powerpc/machdep.h

Simple merge
Simple merge
@@@ -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) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge