lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 4 Apr 2011 03:06:45 -0700 From: Tejun Heo <tj@...nel.org> To: Ingo Molnar <mingo@...hat.com> Cc: Yinghai Lu <yinghai@...nel.org>, Cyrill Gorcunov <gorcunov@...il.com>, David Rientjes <rientjes@...gle.com>, "H. Peter Anvin" <hpa@...ux.intel.com>, Thomas Gleixner <tglx@...utronix.de>, linux-kernel@...r.kernel.org Subject: [PATCH tip:x86/urgent] 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 breking 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@...nel.org> Cc: Ingo Molnar <mingo@...hat.com> Cc: Yinghai Lu <yinghai@...nel.org> Cc: Cyrill Gorcunov <gorcunov@...il.com> Cc: David Rientjes <rientjes@...gle.com> Cc: H. Peter Anvin <hpa@...ux.intel.com> Cc: Thomas Gleixner <tglx@...utronix.de> --- arch/x86/mm/srat_32.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: work/arch/x86/mm/srat_32.c =================================================================== --- work.orig/arch/x86/mm/srat_32.c +++ work/arch/x86/mm/srat_32.c @@ -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"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists