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/init_32.c | |
parent | 3fd44736db9a5bf33e4a216b9cd43c9cfd57c459 (diff) | |
parent | 2bf3016f89344d4cd8b2c96bbec2b642a2bde413 (diff) | |
download | kernel_samsung_aries-930074b6b9c4895d20cdadba5aff97907e28728d.zip kernel_samsung_aries-930074b6b9c4895d20cdadba5aff97907e28728d.tar.gz kernel_samsung_aries-930074b6b9c4895d20cdadba5aff97907e28728d.tar.bz2 |
Merge commit 'jwb/jwb-next'
Diffstat (limited to 'arch/powerpc/mm/init_32.c')
-rw-r--r-- | arch/powerpc/mm/init_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index 4541859..388ceda 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c @@ -57,8 +57,8 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); -unsigned long total_memory; -unsigned long total_lowmem; +phys_addr_t total_memory; +phys_addr_t total_lowmem; phys_addr_t memstart_addr = (phys_addr_t)~0ull; EXPORT_SYMBOL(memstart_addr); |