Merge ../linux-2.6

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc arch/powerpc/mm/hash_utils_64.c
index b6970c96d96f5431436e662e32ad2c98deb8073a,b2f3dbca695223fc988c1be9cc778243481eb221..37273f518a350712c8dac36cdef4707677f8aca1
--- 1/arch/powerpc/mm/hash_utils_64.c
--- 2/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) {

diff --cc arch/powerpc/mm/init_64.c
Simple merge

diff --cc arch/powerpc/mm/pgtable_64.c
Simple merge

diff --cc arch/powerpc/platforms/iseries/setup.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/lpar.c
Simple merge

diff --cc arch/ppc64/kernel/prom.c
Simple merge

diff --cc include/asm-powerpc/machdep.h
Simple merge