diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-06 18:39:06 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 22:56:12 -0400 |
| commit | bf23c51f1f49d3960f3cd8e3d2e7f943d9c41042 (patch) | |
| tree | 6150486aaeb3bc8601fdf61ebfe5b441af1e3fb7 /include/linux/memblock.h | |
| parent | 4734b594c6ca1be796d30c82d93fdf5160f45124 (diff) | |
memblock: Move memblock arrays to static storage in memblock.c and make their size a variable
This is in preparation for having resizable arrays.
Note that we still allocate one more than needed, this is unchanged from
the previous implementation.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index c9c7b0f344a5..150be938b910 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <asm/memblock.h> | 19 | #include <asm/memblock.h> |
| 20 | 20 | ||
| 21 | #define MAX_MEMBLOCK_REGIONS 128 | 21 | #define INIT_MEMBLOCK_REGIONS 128 |
| 22 | 22 | ||
| 23 | struct memblock_region { | 23 | struct memblock_region { |
| 24 | phys_addr_t base; | 24 | phys_addr_t base; |
| @@ -26,8 +26,9 @@ struct memblock_region { | |||
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | struct memblock_type { | 28 | struct memblock_type { |
| 29 | unsigned long cnt; | 29 | unsigned long cnt; /* number of regions */ |
| 30 | struct memblock_region regions[MAX_MEMBLOCK_REGIONS+1]; | 30 | unsigned long max; /* size of the allocated array */ |
| 31 | struct memblock_region *regions; | ||
| 31 | }; | 32 | }; |
| 32 | 33 | ||
| 33 | struct memblock { | 34 | struct memblock { |
