aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-12-08 13:22:07 -0500
committerTejun Heo <tj@kernel.org>2011-12-08 13:22:07 -0500
commitc5a1cb284b791fcc3c70962331a682452afaf6cd (patch)
tree5d619ff74588c55393bd9842f2aae55c181a721e /mm/memblock.c
parent4ff7b82f1e5fc65a7c9512b231b4ea533f28541a (diff)
memblock: Kill sentinel entries at the end of static region arrays
memblock no longer depends on having one more entry at the end during addition making the sentinel entries at the end of region arrays not too useful. Remove the sentinels. This eases further updates. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Yinghai Lu <yinghai@kernel.org>
Diffstat (limited to 'mm/memblock.c')
-rw-r--r--mm/memblock.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 4b80f6fae091..e808df845bbb 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -24,8 +24,8 @@ struct memblock memblock __initdata_memblock;
24 24
25int memblock_debug __initdata_memblock; 25int memblock_debug __initdata_memblock;
26int memblock_can_resize __initdata_memblock; 26int memblock_can_resize __initdata_memblock;
27static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock; 27static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
28static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock; 28static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
29 29
30/* inline so we don't get a warning when pr_debug is compiled out */ 30/* inline so we don't get a warning when pr_debug is compiled out */
31static inline const char *memblock_type_name(struct memblock_type *type) 31static inline const char *memblock_type_name(struct memblock_type *type)
@@ -911,12 +911,6 @@ void __init memblock_analyze(void)
911{ 911{
912 int i; 912 int i;
913 913
914 /* Check marker in the unused last array entry */
915 WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base
916 != MEMBLOCK_INACTIVE);
917 WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base
918 != MEMBLOCK_INACTIVE);
919
920 memblock.memory_size = 0; 914 memblock.memory_size = 0;
921 915
922 for (i = 0; i < memblock.memory.cnt; i++) 916 for (i = 0; i < memblock.memory.cnt; i++)
@@ -940,10 +934,6 @@ void __init memblock_init(void)
940 memblock.reserved.regions = memblock_reserved_init_regions; 934 memblock.reserved.regions = memblock_reserved_init_regions;
941 memblock.reserved.max = INIT_MEMBLOCK_REGIONS; 935 memblock.reserved.max = INIT_MEMBLOCK_REGIONS;
942 936
943 /* Write a marker in the unused last array entry */
944 memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = MEMBLOCK_INACTIVE;
945 memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = MEMBLOCK_INACTIVE;
946
947 /* Create a dummy zero size MEMBLOCK which will get coalesced away later. 937 /* Create a dummy zero size MEMBLOCK which will get coalesced away later.
948 * This simplifies the memblock_add() code below... 938 * This simplifies the memblock_add() code below...
949 */ 939 */