aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/setup.c18
-rw-r--r--arch/microblaze/kernel/prom.c5
-rw-r--r--arch/openrisc/kernel/prom.c6
3 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 4a5f6243ade2..7feb0c97d0dd 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -147,24 +147,6 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
147 pr_info("Machine: %s\n", machine_name); 147 pr_info("Machine: %s\n", machine_name);
148} 148}
149 149
150void __init early_init_dt_add_memory_arch(u64 base, u64 size)
151{
152 base &= PAGE_MASK;
153 size &= PAGE_MASK;
154 if (base + size < PHYS_OFFSET) {
155 pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
156 base, base + size);
157 return;
158 }
159 if (base < PHYS_OFFSET) {
160 pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
161 base, PHYS_OFFSET);
162 size -= PHYS_OFFSET - base;
163 base = PHYS_OFFSET;
164 }
165 memblock_add(base, size);
166}
167
168/* 150/*
169 * Limit the memory size that was specified via FDT. 151 * Limit the memory size that was specified via FDT.
170 */ 152 */
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index e13686ede330..951e4d61ca2d 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -41,11 +41,6 @@
41#include <asm/sections.h> 41#include <asm/sections.h>
42#include <asm/pci-bridge.h> 42#include <asm/pci-bridge.h>
43 43
44void __init early_init_dt_add_memory_arch(u64 base, u64 size)
45{
46 memblock_add(base, size);
47}
48
49#ifdef CONFIG_EARLY_PRINTK 44#ifdef CONFIG_EARLY_PRINTK
50static char *stdout; 45static char *stdout;
51 46
diff --git a/arch/openrisc/kernel/prom.c b/arch/openrisc/kernel/prom.c
index fbed459ea365..6dbcaa85421c 100644
--- a/arch/openrisc/kernel/prom.c
+++ b/arch/openrisc/kernel/prom.c
@@ -47,12 +47,6 @@
47#include <asm/sections.h> 47#include <asm/sections.h>
48#include <asm/setup.h> 48#include <asm/setup.h>
49 49
50void __init early_init_dt_add_memory_arch(u64 base, u64 size)
51{
52 size &= PAGE_MASK;
53 memblock_add(base, size);
54}
55
56void __init early_init_devtree(void *params) 50void __init early_init_devtree(void *params)
57{ 51{
58 early_init_dt_scan(params); 52 early_init_dt_scan(params);