summaryrefslogtreecommitdiffstats
path: root/include/linux/memblock.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt2010-07-07 00:39:04 +0200
committerBenjamin Herrenschmidt2010-08-05 04:56:10 +0200
commit9d3c30f5a17ec35894eadb7171f724643dce19c3 (patch)
treec5c6f448b79facd126bc11e70ae5e19ade320127 /include/linux/memblock.h
parentmemblock: Change u64 to phys_addr_t (diff)
downloadkernel-qcow2-linux-9d3c30f5a17ec35894eadb7171f724643dce19c3.tar.gz
kernel-qcow2-linux-9d3c30f5a17ec35894eadb7171f724643dce19c3.tar.xz
kernel-qcow2-linux-9d3c30f5a17ec35894eadb7171f724643dce19c3.zip
memblock: Remove unused memblock.debug struct member
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include/linux/memblock.h')
-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 b65045a4ed08..0fe6dd56a4b4 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -32,7 +32,6 @@ struct memblock_type {
};
struct memblock {
- unsigned long debug;
phys_addr_t current_limit;
struct memblock_type memory;
struct memblock_type reserved;
@@ -55,9 +54,11 @@ extern phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align);
#define MEMBLOCK_ALLOC_ACCESSIBLE 0
extern phys_addr_t __init memblock_alloc_base(phys_addr_t size,
- phys_addr_t, phys_addr_t max_addr);
+ phys_addr_t align,
+ phys_addr_t max_addr);
extern phys_addr_t __init __memblock_alloc_base(phys_addr_t size,
- phys_addr_t align, phys_addr_t max_addr);
+ phys_addr_t align,
+ phys_addr_t max_addr);
extern phys_addr_t __init memblock_phys_mem_size(void);
extern phys_addr_t memblock_end_of_DRAM(void);
extern void __init memblock_enforce_memory_limit(phys_addr_t memory_limit);