Merge branch 'linus' into release

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index c19b686db9b8..d541671caf4a 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -203,7 +203,6 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
                             Boot-time Table Parsing
    -------------------------------------------------------------------------- */
 
-static int total_cpus __initdata;
 static int available_cpus __initdata;
 struct acpi_table_madt *acpi_madt __initdata;
 static u8 has_8259;
@@ -1002,7 +1001,7 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
         node = pxm_to_node(pxm);
 
         if (node >= MAX_NUMNODES || !node_online(node) ||
-            cpus_empty(node_to_cpumask(node)))
+            cpumask_empty(cpumask_of_node(node)))
                 return AE_OK;
 
         /* We know a gsi to node mapping! */