---

yaml --- r: 46422 b: refs/heads/master c: defad23 h: refs/heads/master v: v3
git-mirror · Feb 3, 2007 · 3f40f6e · 3f40f6e
1 parent 10769da
commit 3f40f6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45eded8703c0f9d58a8807f80baa9fe98ac0ec67
+refs/heads/master: defad23020bb7701b3ad414135c73fc03054507b
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
@@ -422,8 +422,8 @@ static int get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)
 	int pxm;
 
 	pxm = ma->proximity_domain;
-	if (ia64_platform_is("sn2"))
-		pxm += ma->reserved << 8;
+	if (!ia64_platform_is("sn2"))
+		pxm &= 0xff;
 
 	return pxm;
 }