---

yaml
---
r: 286503
b: refs/heads/master
c: cd298f6
h: refs/heads/master
i:
  286501: c9da3f7
  286499: 1830aba
  286495: 0ee7a02
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df0eb7c9d96f9e82f233ee8b74e0f0c8471f868
+refs/heads/master: cd298f60a2451a16e0f077404bf69b62ec868733

trunk/arch/x86/mm/srat.c

@@ -104,6 +104,8 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
 	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
 		return;
 	pxm = pa->proximity_domain_lo;
+	if (acpi_srat_revision >= 2)
+		pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
 	node = setup_node(pxm);
 	if (node < 0) {
 		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
@@ -155,6 +157,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 	start = ma->base_address;
 	end = start + ma->length;
 	pxm = ma->proximity_domain;
+	if (acpi_srat_revision <= 1)
+		pxm &= 0xff;
 	node = setup_node(pxm);
 	if (node < 0) {
 		printk(KERN_ERR "SRAT: Too many proximity domains.\n");