diff options
Diffstat (limited to 'arch/ppc64/kernel/prom.c')
-rw-r--r-- | arch/ppc64/kernel/prom.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c index 7035deb6de92..97bfceb5353b 100644 --- a/arch/ppc64/kernel/prom.c +++ b/arch/ppc64/kernel/prom.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <asm/pgtable.h> | 46 | #include <asm/pgtable.h> |
47 | #include <asm/pci.h> | 47 | #include <asm/pci.h> |
48 | #include <asm/iommu.h> | 48 | #include <asm/iommu.h> |
49 | #include <asm/bootinfo.h> | ||
50 | #include <asm/ppcdebug.h> | 49 | #include <asm/ppcdebug.h> |
51 | #include <asm/btext.h> | 50 | #include <asm/btext.h> |
52 | #include <asm/sections.h> | 51 | #include <asm/sections.h> |
@@ -78,11 +77,14 @@ typedef int interpret_func(struct device_node *, unsigned long *, | |||
78 | extern struct rtas_t rtas; | 77 | extern struct rtas_t rtas; |
79 | extern struct lmb lmb; | 78 | extern struct lmb lmb; |
80 | extern unsigned long klimit; | 79 | extern unsigned long klimit; |
80 | extern unsigned long memory_limit; | ||
81 | 81 | ||
82 | static int __initdata dt_root_addr_cells; | 82 | static int __initdata dt_root_addr_cells; |
83 | static int __initdata dt_root_size_cells; | 83 | static int __initdata dt_root_size_cells; |
84 | static int __initdata iommu_is_off; | 84 | static int __initdata iommu_is_off; |
85 | int __initdata iommu_force_on; | 85 | int __initdata iommu_force_on; |
86 | unsigned long tce_alloc_start, tce_alloc_end; | ||
87 | |||
86 | typedef u32 cell_t; | 88 | typedef u32 cell_t; |
87 | 89 | ||
88 | #if 0 | 90 | #if 0 |
@@ -1063,7 +1065,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
1063 | { | 1065 | { |
1064 | u32 *prop; | 1066 | u32 *prop; |
1065 | u64 *prop64; | 1067 | u64 *prop64; |
1066 | extern unsigned long memory_limit, tce_alloc_start, tce_alloc_end; | ||
1067 | 1068 | ||
1068 | DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname); | 1069 | DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname); |
1069 | 1070 | ||
@@ -1237,7 +1238,7 @@ void __init early_init_devtree(void *params) | |||
1237 | lmb_init(); | 1238 | lmb_init(); |
1238 | scan_flat_dt(early_init_dt_scan_root, NULL); | 1239 | scan_flat_dt(early_init_dt_scan_root, NULL); |
1239 | scan_flat_dt(early_init_dt_scan_memory, NULL); | 1240 | scan_flat_dt(early_init_dt_scan_memory, NULL); |
1240 | lmb_enforce_memory_limit(); | 1241 | lmb_enforce_memory_limit(memory_limit); |
1241 | lmb_analyze(); | 1242 | lmb_analyze(); |
1242 | systemcfg->physicalMemorySize = lmb_phys_mem_size(); | 1243 | systemcfg->physicalMemorySize = lmb_phys_mem_size(); |
1243 | lmb_reserve(0, __pa(klimit)); | 1244 | lmb_reserve(0, __pa(klimit)); |