diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-28 14:31:29 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 12:56:11 +1000 |
| commit | 4734b594c6ca1be796d30c82d93fdf5160f45124 (patch) | |
| tree | 72443c76c7d4c0cade456cc21997f383417747de /include | |
| 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 'include')
| -rw-r--r-- | include/linux/memblock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 0fe6dd56a4b..c9c7b0f344a 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -27,12 +27,12 @@ struct memblock_region { struct memblock_type { unsigned long cnt; - phys_addr_t size; struct memblock_region regions[MAX_MEMBLOCK_REGIONS+1]; }; struct memblock { phys_addr_t current_limit; + phys_addr_t memory_size; /* Updated by memblock_analyze() */ struct memblock_type memory; struct memblock_type reserved; }; |