From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 01:07:31 +0000 (-0700)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0~768
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13588209aa90d9c8e502750fc86160314555612f;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'x86-mm-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
  x86, mm: Allow ZONE_DMA to be configurable
  x86, NUMA: Trim numa meminfo with max_pfn in a separate loop
  x86, NUMA: Rename setup_node_bootmem() to setup_node_data()
  x86, NUMA: Enable emulation on 32bit too
  x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit too
  x86, NUMA: Rename amdtopology_64.c to amdtopology.c
  x86, NUMA: Make numa_init_array() static
  x86, NUMA: Make 32bit use common NUMA init path
  x86, NUMA: Initialize and use remap allocator from setup_node_bootmem()
  x86-32, NUMA: Add @start and @end to init_alloc_remap()
  x86, NUMA: Remove long 64bit assumption from numa.c
  x86, NUMA: Enable build of generic NUMA init code on 32bit
  x86, NUMA: Move NUMA init logic from numa_64.c to numa.c
  x86-32, NUMA: Update numaq to use new NUMA init protocol
  x86-32, NUMA: Replace srat_32.c with srat.c
  x86-32, NUMA: implement temporary NUMA init shims
  x86, NUMA: Move numa_nodes_parsed to numa.[hc]
  x86-32, NUMA: Move get_memcfg_numa() into numa_32.c
  x86, NUMA: make srat.c 32bit safe
  x86, NUMA: rename srat_64.c to srat.c
  ...
---

13588209aa90d9c8e502750fc86160314555612f
diff --cc arch/x86/kernel/mpparse.c
index ef59817,f1b2718..6f9bfff
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@@ -715,9 -715,11 +715,9 @@@ static void __init check_irq_src(struc
  	}
  }
  
- static int
+ static int __init
  check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
  {
 -	int ret = 0;
 -
  	if (!mpc_new_phys || count <= mpc_new_length) {
  		WARN(1, "update_mptable: No spare slots (length: %x)\n", count);
  		return -1;