aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2007-07-21 11:09:55 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 21:37:07 -0400
commita2e212dae57071d4a4a6cbbc12d70c628fd47ad2 (patch)
tree65698c4bd46d06d5a5f5621193091fb2bc24c080
parent42ee2b74140b69fa24da1c671b03c9f8019e6f62 (diff)
x86_64: Use LOCAL_DISTANCE and REMOTE_DISTANCE in x86_64 ACPI code
Use LOCAL_DISTANCE and REMOTE_DISTANCE in x86_64 ACPI code Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86_64/mm/srat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c
index 1e76bb0a7277..a126cb73928b 100644
--- 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)
106 for (j = 0; j < d; j++) { 106 for (j = 0; j < d; j++) {
107 u8 val = slit->entry[d*i + j]; 107 u8 val = slit->entry[d*i + j];
108 if (i == j) { 108 if (i == j) {
109 if (val != 10) 109 if (val != LOCAL_DISTANCE)
110 return 0; 110 return 0;
111 } else if (val <= 10) 111 } else if (val <= LOCAL_DISTANCE)
112 return 0; 112 return 0;
113 } 113 }
114 } 114 }
@@ -464,7 +464,7 @@ int __node_distance(int a, int b)
464 int index; 464 int index;
465 465
466 if (!acpi_slit) 466 if (!acpi_slit)
467 return a == b ? 10 : 20; 467 return a == b ? LOCAL_DISTANCE : REMOTE_DISTANCE;
468 index = acpi_slit->locality_count * node_to_pxm(a); 468 index = acpi_slit->locality_count * node_to_pxm(a);
469 return acpi_slit->entry[index + node_to_pxm(b)]; 469 return acpi_slit->entry[index + node_to_pxm(b)];
470} 470}