4 files changed, 53 insertions, 2 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2b2fbec14540..94b8d820c512 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -161,7 +161,7 @@ config ACPI_THERMAL
 config ACPI_NUMA
         bool "NUMA support"
         depends on NUMA
-        depends on (IA64 || X86_64)
+        depends on (X86 || IA64)
         default y if IA64_GENERIC || IA64_SGI_SN2
 
 config ACPI_ASUS
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 64b98e82feb7..e2c1a16078c9 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -36,12 +36,60 @@
 #define _COMPONENT      ACPI_NUMA
 ACPI_MODULE_NAME("numa")
 
+static nodemask_t nodes_found_map = NODE_MASK_NONE;
+#define PXM_INVAL       -1
+#define NID_INVAL       -1
+
+/* maps to convert between proximity domain and logical node ID */
+int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
+                                = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };
+int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
+                                = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
+
 extern int __init acpi_table_parse_madt_family(enum acpi_table_id id,
                                                unsigned long madt_size,
                                                int entry_id,
                                                acpi_madt_entry_handler handler,
                                                unsigned int max_entries);
 
+int __cpuinit pxm_to_node(int pxm)
+{
+        if (pxm < 0)
+                return NID_INVAL;
+        return pxm_to_node_map[pxm];
+}
+
+int __cpuinit node_to_pxm(int node)
+{
+        if (node < 0)
+                return PXM_INVAL;
+        return node_to_pxm_map[node];
+}
+
+int __cpuinit acpi_map_pxm_to_node(int pxm)
+{
+        int node = pxm_to_node_map[pxm];
+
+        if (node < 0){
+                if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
+                        return NID_INVAL;
+                node = first_unset_node(nodes_found_map);
+                pxm_to_node_map[pxm] = node;
+                node_to_pxm_map[node] = pxm;
+                node_set(node, nodes_found_map);
+        }
+
+        return node;
+}
+
+void __cpuinit acpi_unmap_pxm_to_node(int node)
+{
+        int pxm = node_to_pxm_map[node];
+        pxm_to_node_map[pxm] = NID_INVAL;
+        node_to_pxm_map[node] = PXM_INVAL;
+        node_clear(node, nodes_found_map);
+}
+
 void __init acpi_table_print_srat_entry(acpi_table_entry_header * header)
 {
 
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index b55ad1add1b0..228bdb626502 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -813,6 +813,9 @@ static int irqrouter_resume(struct sys_device *dev)
 
         ACPI_FUNCTION_TRACE("irqrouter_resume");
 
+        /* Make sure SCI is enabled again (Apple firmware bug?) */
+        acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1, ACPI_MTX_DO_NOT_LOCK);
+
         acpi_in_resume = 1;
         list_for_each(node, &acpi_link.entries) {
                 link = list_entry(node, struct acpi_pci_link, node);
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index a1b46fb41c80..decaebb4cbe9 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -110,7 +110,7 @@ static struct file_operations acpi_processor_info_fops = {
 };
 
 struct acpi_processor *processors[NR_CPUS];
-struct acpi_processor_errata errata;
+struct acpi_processor_errata errata __read_mostly;
 
 /* --------------------------------------------------------------------------
                                 Errata Handling