diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2014-04-16 15:34:05 +0530 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-04-30 11:39:08 +0530 |
| commit | bc314a47db2b7a3d3f363643188d2641128a19c1 (patch) | |
| tree | fa5e84b30f1b29c59dc2333774eda85587e7892c /arch/microblaze | |
| parent | d03e873944e99287cdafdecbe36301cb0ea02dfb (diff) | |
of: create default early_init_dt_add_memory_arch
Create a weak version of early_init_dt_add_memory_arch which uses
memblock. This will unify all architectures except ones with custom
memory bank structs.
Conflicts:
arch/openrisc/kernel/prom.c
(cherry picked from commit 068f6310b965d67d57f89ebf4c539e5933754366)
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Jonas Bonn <jonas@southpole.se>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: linux@lists.openrisc.net
Cc: devicetree@vger.kernel.org
Change-Id: I8f3bd8d9d0816666cf90363e16f596b365db4632
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/prom.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 0c4453f134cb..59f2df02e817 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -41,11 +41,6 @@ #include <asm/sections.h> #include <asm/pci-bridge.h> -void __init early_init_dt_add_memory_arch(u64 base, u64 size) -{ - memblock_add(base, size); -} - #ifdef CONFIG_EARLY_PRINTK static char *stdout; |