|
@@ -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);
|