diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-28 04:31:29 (GMT) |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 02:56:11 (GMT) |
| commit | 4734b594c6ca1be796d30c82d93fdf5160f45124 (patch) | |
| tree | 72443c76c7d4c0cade456cc21997f383417747de /arch/powerpc/mm | |
| parent | 9d3c30f5a17ec35894eadb7171f724643dce19c3 (diff) | |
| download | linux-fsl-qoriq-4734b594c6ca1be796d30c82d93fdf5160f45124.tar.xz | |
memblock: Remove memblock_type.size and add memblock.memory_size instead
Right now, both the "memory" and "reserved" memblock_type structures have
a "size" member. It represents the calculated memory size in the former
case and is unused in the latter.
This moves it out to the main memblock structure instead
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 52df542..f661f6c 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -301,7 +301,7 @@ void __init mem_init(void) swiotlb_init(1); #endif - num_physpages = memblock.memory.size >> PAGE_SHIFT; + num_physpages = memblock_phys_mem_size() >> PAGE_SHIFT; high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); #ifdef CONFIG_NEED_MULTIPLE_NODES |