summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/hash_utils_64.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-02-27 19:27:34 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-27 19:27:34 +0100
commitf3b270a47882b958e9e3c5bd86894e3a7072899a (patch)
treede3bdfd5d67e8310257b93ac3d8d703599b9d929 /arch/powerpc/mm/hash_utils_64.c
parent[GFS2] Remove pointless comment from nolock/main.c (diff)
parentLinux v2.6.16-rc5 (diff)
downloadlinux-f3b270a47882b958e9e3c5bd86894e3a7072899a.tar.xz
linux-f3b270a47882b958e9e3c5bd86894e3a7072899a.zip
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
-rw-r--r--arch/powerpc/mm/hash_utils_64.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 149351a84b94..b1f614c612dd 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -88,6 +88,7 @@ static unsigned long _SDR1;
struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
hpte_t *htab_address;
+unsigned long htab_size_bytes;
unsigned long htab_hash_mask;
int mmu_linear_psize = MMU_PAGE_4K;
int mmu_virtual_psize = MMU_PAGE_4K;
@@ -399,7 +400,7 @@ void create_section_mapping(unsigned long start, unsigned long end)
void __init htab_initialize(void)
{
- unsigned long table, htab_size_bytes;
+ unsigned long table;
unsigned long pteg_count;
unsigned long mode_rw;
unsigned long base = 0, size = 0;