x86_64: Use LOCAL_DISTANCE and REMOTE_DISTANCE in x86_64 ACPI code

rientjes · Linus Torvalds · commit a2e212dae570 · 2007-07-21T18:37:07.000-07:00
Use LOCAL_DISTANCE and  REMOTE_DISTANCE in x86_64 ACPI code

Signed-off-by: David Rientjes &lt;rientjes@google.com&gt;
Signed-off-by: Andi Kleen &lt;ak@suse.de&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c
@@ -106,9 +106,9 @@ static __init int slit_valid(struct acpi_table_slit *slit)
 		for (j = 0; j < d; j++)  {
 			u8 val = slit->entry[d*i + j];
 			if (i == j) {
-				if (val != 10)
+				if (val != LOCAL_DISTANCE)
 					return 0;
-			} else if (val <= 10)
+			} else if (val <= LOCAL_DISTANCE)
 				return 0;
 		}
 	}
@@ -464,7 +464,7 @@ int __node_distance(int a, int b)
 	int index;
 
 	if (!acpi_slit)
-		return a == b ? 10 : 20;
+		return a == b ? LOCAL_DISTANCE : REMOTE_DISTANCE;
 	index = acpi_slit->locality_count * node_to_pxm(a);
 	return acpi_slit->entry[index + node_to_pxm(b)];
 }

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,9 @@ static __init int slit_valid(struct acpi_table_slit *slit)`
`106`	`106`	`for (j = 0; j < d; j++) {`
`107`	`107`	`u8 val = slit->entry[d*i + j];`
`108`	`108`	`if (i == j) {`
`109`		`- if (val != 10)`
	`109`	`+ if (val != LOCAL_DISTANCE)`
`110`	`110`	`return 0;`
`111`		`- } else if (val <= 10)`
	`111`	`+ } else if (val <= LOCAL_DISTANCE)`
`112`	`112`	`return 0;`
`113`	`113`	`}`
`114`	`114`	`}`
`@@ -464,7 +464,7 @@ int __node_distance(int a, int b)`
`464`	`464`	`int index;`
`465`	`465`
`466`	`466`	`if (!acpi_slit)`
`467`		`- return a == b ? 10 : 20;`
	`467`	`+ return a == b ? LOCAL_DISTANCE : REMOTE_DISTANCE;`
`468`	`468`	`index = acpi_slit->locality_count * node_to_pxm(a);`
`469`	`469`	`return acpi_slit->entry[index + node_to_pxm(b)];`
`470`	`470`	`}`