|
@@ -758,9 +758,9 @@ void __init memblock_analyze(void)
|
|
|
|
|
|
/* Check marker in the unused last array entry */
|
|
/* Check marker in the unused last array entry */
|
|
WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base
|
|
WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base
|
|
- != (phys_addr_t)RED_INACTIVE);
|
|
|
|
|
|
+ != MEMBLOCK_INACTIVE);
|
|
WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base
|
|
WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base
|
|
- != (phys_addr_t)RED_INACTIVE);
|
|
|
|
|
|
+ != MEMBLOCK_INACTIVE);
|
|
|
|
|
|
memblock.memory_size = 0;
|
|
memblock.memory_size = 0;
|
|
|
|
|
|
@@ -786,8 +786,8 @@ void __init memblock_init(void)
|
|
memblock.reserved.max = INIT_MEMBLOCK_REGIONS;
|
|
memblock.reserved.max = INIT_MEMBLOCK_REGIONS;
|
|
|
|
|
|
/* Write a marker in the unused last array entry */
|
|
/* Write a marker in the unused last array entry */
|
|
- memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
|
|
|
|
- memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
|
|
|
|
|
|
+ memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = MEMBLOCK_INACTIVE;
|
|
|
|
+ memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = MEMBLOCK_INACTIVE;
|
|
|
|
|
|
/* Create a dummy zero size MEMBLOCK which will get coalesced away later.
|
|
/* Create a dummy zero size MEMBLOCK which will get coalesced away later.
|
|
* This simplifies the memblock_add() code below...
|
|
* This simplifies the memblock_add() code below...
|