diff options
Diffstat (limited to 'arch/score')
-rw-r--r-- | arch/score/Kconfig | 3 | ||||
-rw-r--r-- | arch/score/kernel/setup.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index df169e84db4e..e5ae12f48781 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig | |||
@@ -4,6 +4,9 @@ config SCORE | |||
4 | def_bool y | 4 | def_bool y |
5 | select HAVE_GENERIC_HARDIRQS | 5 | select HAVE_GENERIC_HARDIRQS |
6 | select GENERIC_IRQ_SHOW | 6 | select GENERIC_IRQ_SHOW |
7 | select HAVE_MEMBLOCK | ||
8 | select HAVE_MEMBLOCK_NODE_MAP | ||
9 | select ARCH_DISCARD_MEMBLOCK | ||
7 | 10 | ||
8 | choice | 11 | choice |
9 | prompt "System type" | 12 | prompt "System type" |
diff --git a/arch/score/kernel/setup.c b/arch/score/kernel/setup.c index 6f898c057878..b48459afefdd 100644 --- a/arch/score/kernel/setup.c +++ b/arch/score/kernel/setup.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/bootmem.h> | 26 | #include <linux/bootmem.h> |
27 | #include <linux/initrd.h> | 27 | #include <linux/initrd.h> |
28 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
29 | #include <linux/memblock.h> | ||
29 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
30 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
31 | #include <linux/screen_info.h> | 32 | #include <linux/screen_info.h> |
@@ -54,7 +55,8 @@ static void __init bootmem_init(void) | |||
54 | /* Initialize the boot-time allocator with low memory only. */ | 55 | /* Initialize the boot-time allocator with low memory only. */ |
55 | bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn, | 56 | bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn, |
56 | min_low_pfn, max_low_pfn); | 57 | min_low_pfn, max_low_pfn); |
57 | add_active_range(0, min_low_pfn, max_low_pfn); | 58 | memblock_add_node(PFN_PHYS(min_low_pfn), |
59 | PFN_PHYS(max_low_pfn - min_low_pfn), 0); | ||
58 | 60 | ||
59 | free_bootmem(PFN_PHYS(start_pfn), | 61 | free_bootmem(PFN_PHYS(start_pfn), |
60 | (max_low_pfn - start_pfn) << PAGE_SHIFT); | 62 | (max_low_pfn - start_pfn) << PAGE_SHIFT); |