diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-09 11:27:52 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 03:48:22 -0400 |
commit | 2778f62056ada442414392d7ccd41188bb631619 (patch) | |
tree | a7c15cc7ca077e5e4c2161f5062c44e408c03a08 /arch/arm/kernel | |
parent | 4bb2e27db10abc555dfabd73661485fb75e4e97d (diff) |
ARM: initial LMB trial
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 387d2e9cb51f..dfd293477751 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/smp.h> | 25 | #include <linux/smp.h> |
26 | #include <linux/fs.h> | 26 | #include <linux/fs.h> |
27 | #include <linux/proc_fs.h> | 27 | #include <linux/proc_fs.h> |
28 | #include <linux/memblock.h> | ||
28 | 29 | ||
29 | #include <asm/unified.h> | 30 | #include <asm/unified.h> |
30 | #include <asm/cpu.h> | 31 | #include <asm/cpu.h> |
@@ -715,6 +716,8 @@ void __init setup_arch(char **cmdline_p) | |||
715 | 716 | ||
716 | parse_early_param(); | 717 | parse_early_param(); |
717 | 718 | ||
719 | arm_memblock_init(&meminfo); | ||
720 | |||
718 | paging_init(mdesc); | 721 | paging_init(mdesc); |
719 | request_standard_resources(&meminfo, mdesc); | 722 | request_standard_resources(&meminfo, mdesc); |
720 | 723 | ||