From 74d3f8943b2bd181476f1ea9bac2e2e18855fc20 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Fri, 13 Feb 2009 11:57:30 +0000 Subject: [PATCH] --- yaml --- r: 138475 b: refs/heads/master c: 13870b657578bcce167978ee93dc02bf54e3beb0 h: refs/heads/master i: 138473: c4701fade133dd9adbe3a76729d54d805c71f0e6 138471: 3c3e3b6de2b75ae6669ad01df5ad1a329ada5bc7 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/hash_utils_64.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 71255403330d..244ecb1318bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33f00dcedb0e22cdb156a23632814fc580fcfcf8 +refs/heads/master: 13870b657578bcce167978ee93dc02bf54e3beb0 diff --git a/trunk/arch/powerpc/mm/hash_utils_64.c b/trunk/arch/powerpc/mm/hash_utils_64.c index 8d5b4758c13a..f5bc1b213f24 100644 --- a/trunk/arch/powerpc/mm/hash_utils_64.c +++ b/trunk/arch/powerpc/mm/hash_utils_64.c @@ -516,7 +516,7 @@ static int __init htab_dt_scan_pftsize(unsigned long node, static unsigned long __init htab_get_table_size(void) { - unsigned long mem_size, rnd_mem_size, pteg_count; + unsigned long mem_size, rnd_mem_size, pteg_count, psize; /* If hash size isn't already provided by the platform, we try to * retrieve it from the device-tree. If it's not there neither, we @@ -534,7 +534,8 @@ static unsigned long __init htab_get_table_size(void) rnd_mem_size <<= 1; /* # pages / 2 */ - pteg_count = max(rnd_mem_size >> (12 + 1), 1UL << 11); + psize = mmu_psize_defs[mmu_virtual_psize].shift; + pteg_count = max(rnd_mem_size >> (psize + 1), 1UL << 11); return pteg_count << 7; }