diff options
Diffstat (limited to 'include/asm-powerpc/lmb.h')
-rw-r--r-- | include/asm-powerpc/lmb.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/include/asm-powerpc/lmb.h b/include/asm-powerpc/lmb.h index d3546c4c9f46..0c5880f70225 100644 --- a/include/asm-powerpc/lmb.h +++ b/include/asm-powerpc/lmb.h | |||
@@ -19,8 +19,6 @@ | |||
19 | 19 | ||
20 | #define MAX_LMB_REGIONS 128 | 20 | #define MAX_LMB_REGIONS 128 |
21 | 21 | ||
22 | #define LMB_ALLOC_ANYWHERE 0 | ||
23 | |||
24 | struct lmb_property { | 22 | struct lmb_property { |
25 | unsigned long base; | 23 | unsigned long base; |
26 | unsigned long size; | 24 | unsigned long size; |
@@ -43,20 +41,19 @@ extern struct lmb lmb; | |||
43 | 41 | ||
44 | extern void __init lmb_init(void); | 42 | extern void __init lmb_init(void); |
45 | extern void __init lmb_analyze(void); | 43 | extern void __init lmb_analyze(void); |
46 | extern long __init lmb_add(unsigned long, unsigned long); | 44 | extern long __init lmb_add(unsigned long base, unsigned long size); |
47 | extern long __init lmb_reserve(unsigned long, unsigned long); | 45 | extern long __init lmb_reserve(unsigned long base, unsigned long size); |
48 | extern unsigned long __init lmb_alloc(unsigned long, unsigned long); | 46 | extern unsigned long __init lmb_alloc(unsigned long size, unsigned long align); |
49 | extern unsigned long __init lmb_alloc_base(unsigned long, unsigned long, | 47 | extern unsigned long __init lmb_alloc_base(unsigned long size, |
50 | unsigned long); | 48 | unsigned long align, unsigned long max_addr); |
49 | extern unsigned long __init __lmb_alloc_base(unsigned long size, | ||
50 | unsigned long align, unsigned long max_addr); | ||
51 | extern unsigned long __init lmb_phys_mem_size(void); | 51 | extern unsigned long __init lmb_phys_mem_size(void); |
52 | extern unsigned long __init lmb_end_of_DRAM(void); | 52 | extern unsigned long __init lmb_end_of_DRAM(void); |
53 | extern unsigned long __init lmb_abs_to_phys(unsigned long); | 53 | extern void __init lmb_enforce_memory_limit(unsigned long memory_limit); |
54 | extern void __init lmb_enforce_memory_limit(unsigned long); | ||
55 | 54 | ||
56 | extern void lmb_dump_all(void); | 55 | extern void lmb_dump_all(void); |
57 | 56 | ||
58 | extern unsigned long io_hole_start; | ||
59 | |||
60 | static inline unsigned long | 57 | static inline unsigned long |
61 | lmb_size_bytes(struct lmb_region *type, unsigned long region_nr) | 58 | lmb_size_bytes(struct lmb_region *type, unsigned long region_nr) |
62 | { | 59 | { |