[PATCH] x86: use the correct macros

[Yasuaki Ishimatsu]

This patch fixes to use the correct macros. 

CC: Len Brown <lenb@xxxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Ingo Molnar <mingo@xxxxxxxxxx>
CC: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
---
 arch/x86/kernel/acpi/boot.c |    2 +-
 drivers/acpi/numa.c         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-3.6-rc5/arch/x86/kernel/acpi/boot.c
===================================================================
--- linux-3.6-rc5.orig/arch/x86/kernel/acpi/boot.c	2012-09-13 15:44:30.000000000 +0900
+++ linux-3.6-rc5/arch/x86/kernel/acpi/boot.c	2012-09-13 15:46:31.743850426 +0900
@@ -601,7 +601,7 @@ static void __cpuinit acpi_map_cpu2node(
 	int nid;
 
 	nid = acpi_get_node(handle);
-	if (nid == -1 || !node_online(nid))
+	if (nid == NUMA_NO_NODE || !node_online(nid))
 		return;
 	set_apicid_to_node(physid, nid);
 	numa_set_node(cpu, nid);
Index: linux-3.6-rc5/drivers/acpi/numa.c
===================================================================
--- linux-3.6-rc5.orig/drivers/acpi/numa.c	2012-09-13 15:44:59.000000000 +0900
+++ linux-3.6-rc5/drivers/acpi/numa.c	2012-09-13 15:46:03.079850552 +0900
@@ -327,12 +327,12 @@ int acpi_get_pxm(acpi_handle h)
 			return pxm;
 		status = acpi_get_parent(handle, &phandle);
 	} while (ACPI_SUCCESS(status));
-	return -1;
+	return PXM_INVAL;
 }
 
 int acpi_get_node(acpi_handle *handle)
 {
-	int pxm, node = -1;
+	int pxm, node = NUMA_NO_NODE;
 
 	pxm = acpi_get_pxm(handle);
 	if (pxm >= 0 && pxm < MAX_PXM_DOMAINS)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/