aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memblock.h3
-rw-r--r--mm/memblock.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index eed0f9b8e526..1a9c29cc92fa 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -18,7 +18,8 @@
18 18
19#include <asm/memblock.h> 19#include <asm/memblock.h>
20 20
21#define INIT_MEMBLOCK_REGIONS 128 21#define INIT_MEMBLOCK_REGIONS 128
22#define MEMBLOCK_ERROR (~(phys_addr_t)0)
22 23
23struct memblock_region { 24struct memblock_region {
24 phys_addr_t base; 25 phys_addr_t base;
diff --git a/mm/memblock.c b/mm/memblock.c
index c3703abf057e..85cfa1d3ab28 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -27,8 +27,6 @@ int memblock_can_resize;
27static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1]; 27static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1];
28static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1]; 28static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1];
29 29
30#define MEMBLOCK_ERROR (~(phys_addr_t)0)
31
32/* 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 */
33static inline const char *memblock_type_name(struct memblock_type *type) 31static inline const char *memblock_type_name(struct memblock_type *type)
34{ 32{