aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memblock.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index b65045a4ed0..0fe6dd56a4b 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -32,7 +32,6 @@ struct memblock_type {
32}; 32};
33 33
34struct memblock { 34struct memblock {
35 unsigned long debug;
36 phys_addr_t current_limit; 35 phys_addr_t current_limit;
37 struct memblock_type memory; 36 struct memblock_type memory;
38 struct memblock_type reserved; 37 struct memblock_type reserved;
@@ -55,9 +54,11 @@ extern phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align);
55#define MEMBLOCK_ALLOC_ACCESSIBLE 0 54#define MEMBLOCK_ALLOC_ACCESSIBLE 0
56 55
57extern phys_addr_t __init memblock_alloc_base(phys_addr_t size, 56extern phys_addr_t __init memblock_alloc_base(phys_addr_t size,
58 phys_addr_t, phys_addr_t max_addr); 57 phys_addr_t align,
58 phys_addr_t max_addr);
59extern phys_addr_t __init __memblock_alloc_base(phys_addr_t size, 59extern phys_addr_t __init __memblock_alloc_base(phys_addr_t size,
60 phys_addr_t align, phys_addr_t max_addr); 60 phys_addr_t align,
61 phys_addr_t max_addr);
61extern phys_addr_t __init memblock_phys_mem_size(void); 62extern phys_addr_t __init memblock_phys_mem_size(void);
62extern phys_addr_t memblock_end_of_DRAM(void); 63extern phys_addr_t memblock_end_of_DRAM(void);
63extern void __init memblock_enforce_memory_limit(phys_addr_t memory_limit); 64extern void __init memblock_enforce_memory_limit(phys_addr_t memory_limit);