diff options
| author | Tejun Heo | 2011-02-16 12:13:06 +0100 |
|---|---|---|
| committer | Tejun Heo | 2011-02-16 12:13:06 +0100 |
| commit | d8fc3afc49bb226c20e37f48a4ddd493cd092837 (patch) | |
| tree | 96bf7b0f4e47e798697ea72a180da528be0d8902 /arch/x86/mm/init_32.c | |
| parent | x86-64, NUMA: Wrap acpi_numa_init() so that failure can be indicated by retur... (diff) | |
| download | kernel-qcow2-linux-d8fc3afc49bb226c20e37f48a4ddd493cd092837.tar.gz kernel-qcow2-linux-d8fc3afc49bb226c20e37f48a4ddd493cd092837.tar.xz kernel-qcow2-linux-d8fc3afc49bb226c20e37f48a4ddd493cd092837.zip | |
x86, NUMA: Move *_numa_init() invocations into initmem_init()
There's no reason for these to live in setup_arch(). Move them inside
initmem_init().
- v2: x86-32 initmem_init() weren't updated breaking 32bit builds.
Fixed. Found by Ankita.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ankita Garg <ankita@in.ibm.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/mm/init_32.c')
| -rw-r--r-- | arch/x86/mm/init_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 16adb6665603..5d43fa5141c6 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -644,7 +644,7 @@ void __init find_low_pfn_range(void) } #ifndef CONFIG_NEED_MULTIPLE_NODES -void __init initmem_init(int acpi, int k8) +void __init initmem_init(void) { #ifdef CONFIG_HIGHMEM highstart_pfn = highend_pfn = max_pfn; |