x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Commit d8fc3afc49
(x86, NUMA: Move *_numa_init() invocations
into initmem_init()) moved acpi_numa_init() call into NUMA
initmem_init() but forgot to update 32bit NUMA init breaking ACPI
NUMA configuration for 32bit.
acpi_numa_init() call was later moved again to srat_64.c. Match
it by adding the call to get_memcfg_from_srat() in srat_32.c.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: David Rientjes <rientjes@google.com>
Cc: H. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <20110404100645.GE1420@mtj.dyndns.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
43a6246f9c
Коммит
765af22da8
|
@ -211,10 +211,12 @@ int __init get_memcfg_from_srat(void)
|
|||
{
|
||||
int i, j, nid;
|
||||
|
||||
|
||||
if (srat_disabled())
|
||||
goto out_fail;
|
||||
|
||||
if (acpi_numa_init() < 0)
|
||||
goto out_fail;
|
||||
|
||||
if (num_memory_chunks == 0) {
|
||||
printk(KERN_DEBUG
|
||||
"could not find any ACPI SRAT memory areas.\n");
|
||||
|
|
Загрузка…
Ссылка в новой задаче