From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Dec 2011 06:39:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'memblock/memblock-kill-early_node_map'
X-Git-Tag: next-20111219~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fec732fbd17b50c207fb03372ec501cef02d1e6d;p=karo-tx-linux.git

Merge remote-tracking branch 'memblock/memblock-kill-early_node_map'

Conflicts:
	arch/arm/mm/init.c
	arch/score/Kconfig
---

fec732fbd17b50c207fb03372ec501cef02d1e6d
diff --cc arch/arm/mm/init.c
index 786adddf1a86,7c38474e533a..e34ea8adc1f9
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -310,7 -331,8 +311,6 @@@ void __init arm_memblock_init(struct me
  {
  	int i;
  
- 	memblock_init();
 -	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
 -
  	for (i = 0; i < mi->nr_banks; i++)
  		memblock_add(mi->bank[i].start, mi->bank[i].size);
  
diff --cc arch/score/Kconfig
index 455ce2d76823,8b0c9464aa9d..3df65d39abc1
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@@ -4,7 -4,9 +4,10 @@@ config SCOR
         def_bool y
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
 +       select GENERIC_IOMAP
+        select HAVE_MEMBLOCK
+        select HAVE_MEMBLOCK_NODE_MAP
+        select ARCH_DISCARD_MEMBLOCK
  
  choice
  	prompt "System type"