diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 11:54:57 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 11:54:57 +1000 |
| commit | 930074b6b9c4895d20cdadba5aff97907e28728d (patch) | |
| tree | 3725eca121188f2e9c3b8bb4d4b8ba35e92640c7 /arch/powerpc/mm/mmu_decl.h | |
| parent | 3fd44736db9a5bf33e4a216b9cd43c9cfd57c459 (diff) | |
| parent | 2bf3016f89344d4cd8b2c96bbec2b642a2bde413 (diff) | |
Merge commit 'jwb/jwb-next'
Diffstat (limited to 'arch/powerpc/mm/mmu_decl.h')
| -rw-r--r-- | arch/powerpc/mm/mmu_decl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index 46585b7bb19..fab3cfad409 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -49,8 +49,8 @@ extern unsigned int num_tlbcam_entries; extern unsigned long ioremap_bot; extern unsigned long __max_low_memory; extern phys_addr_t __initial_memory_limit_addr; -extern unsigned long total_memory; -extern unsigned long total_lowmem; +extern phys_addr_t total_memory; +extern phys_addr_t total_lowmem; extern phys_addr_t memstart_addr; extern phys_addr_t lowmem_end_addr; |