hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tejun Heo 2011-12-08 10:22:07 -08:00
parent 4ff7b82f1e
commit c5a1cb284b
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/poison.h
View File

@ -40,12 +40,6 @@
#define RED_INACTIVE 0x09F911029D74E35BULL /* when obj is inactive */ #define RED_INACTIVE 0x09F911029D74E35BULL /* when obj is inactive */
#define RED_ACTIVE 0xD84156C5635688C0ULL /* when obj is active */ #define RED_ACTIVE 0xD84156C5635688C0ULL /* when obj is active */
#ifdef CONFIG_PHYS_ADDR_T_64BIT
#define MEMBLOCK_INACTIVE 0x3a84fb0144c9e71bULL
#else
#define MEMBLOCK_INACTIVE 0x44c9e71bUL
#endif
#define SLUB_RED_INACTIVE 0xbb #define SLUB_RED_INACTIVE 0xbb
#define SLUB_RED_ACTIVE 0xcc #define SLUB_RED_ACTIVE 0xcc

14
mm/memblock.c
View File

@ -24,8 +24,8 @@ struct memblock memblock __initdata_memblock;
int memblock_debug __initdata_memblock; int memblock_debug __initdata_memblock;
int memblock_can_resize __initdata_memblock; int memblock_can_resize __initdata_memblock;
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock; static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock; static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
/* inline so we don't get a warning when pr_debug is compiled out */ /* inline so we don't get a warning when pr_debug is compiled out */
static inline const char *memblock_type_name(struct memblock_type *type) static inline const char *memblock_type_name(struct memblock_type *type)
@ -911,12 +911,6 @@ void __init memblock_analyze(void)
{ {
int i; int i;
/* Check marker in the unused last array entry */
WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base
!= MEMBLOCK_INACTIVE);
WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base
!= MEMBLOCK_INACTIVE);
memblock.memory_size = 0; memblock.memory_size = 0;
for (i = 0; i < memblock.memory.cnt; i++) for (i = 0; i < memblock.memory.cnt; i++)
@ -940,10 +934,6 @@ void __init memblock_init(void)
memblock.reserved.regions = memblock_reserved_init_regions; memblock.reserved.regions = memblock_reserved_init_regions;
memblock.reserved.max = INIT_MEMBLOCK_REGIONS; memblock.reserved.max = INIT_MEMBLOCK_REGIONS;
/* Write a marker in the unused last array entry */
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...
*/ */