diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-28 00:31:29 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 22:56:11 -0400 |
commit | 4734b594c6ca1be796d30c82d93fdf5160f45124 (patch) | |
tree | 72443c76c7d4c0cade456cc21997f383417747de /mm/memblock.c | |
parent | 9d3c30f5a17ec35894eadb7171f724643dce19c3 (diff) |
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 'mm/memblock.c')
-rw-r--r-- | mm/memblock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 81da63592a68..5ae413e9afd8 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -49,7 +49,7 @@ void memblock_dump_all(void) | |||
49 | return; | 49 | return; |
50 | 50 | ||
51 | pr_info("MEMBLOCK configuration:\n"); | 51 | pr_info("MEMBLOCK configuration:\n"); |
52 | pr_info(" memory.size = 0x%llx\n", (unsigned long long)memblock.memory.size); | 52 | pr_info(" memory size = 0x%llx\n", (unsigned long long)memblock.memory_size); |
53 | 53 | ||
54 | memblock_dump(&memblock.memory, "memory"); | 54 | memblock_dump(&memblock.memory, "memory"); |
55 | memblock_dump(&memblock.reserved, "reserved"); | 55 | memblock_dump(&memblock.reserved, "reserved"); |
@@ -123,10 +123,10 @@ void __init memblock_analyze(void) | |||
123 | { | 123 | { |
124 | int i; | 124 | int i; |
125 | 125 | ||
126 | memblock.memory.size = 0; | 126 | memblock.memory_size = 0; |
127 | 127 | ||
128 | for (i = 0; i < memblock.memory.cnt; i++) | 128 | for (i = 0; i < memblock.memory.cnt; i++) |
129 | memblock.memory.size += memblock.memory.regions[i].size; | 129 | memblock.memory_size += memblock.memory.regions[i].size; |
130 | } | 130 | } |
131 | 131 | ||
132 | static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size) | 132 | static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size) |
@@ -423,7 +423,7 @@ phys_addr_t __init __memblock_alloc_base(phys_addr_t size, phys_addr_t align, ph | |||
423 | /* You must call memblock_analyze() before this. */ | 423 | /* You must call memblock_analyze() before this. */ |
424 | phys_addr_t __init memblock_phys_mem_size(void) | 424 | phys_addr_t __init memblock_phys_mem_size(void) |
425 | { | 425 | { |
426 | return memblock.memory.size; | 426 | return memblock.memory_size; |
427 | } | 427 | } |
428 | 428 | ||
429 | phys_addr_t memblock_end_of_DRAM(void) | 429 | phys_addr_t memblock_end_of_DRAM(void) |