Automerge with /usr/src/ntfs-2.6.git.

1 files changed, 1 insertions, 15 deletions

diff --git a/arch/x86_64/pci/k8-bus.c b/arch/x86_64/pci/k8-bus.c
index 62349c78db57..7e7d0c2a0025 100644
--- a/arch/x86_64/pci/k8-bus.c
+++ b/arch/x86_64/pci/k8-bus.c
@@ -53,25 +53,11 @@ fill_mp_bus_to_cpumask(void)
                                 for (j = SECONDARY_LDT_BUS_NUMBER(ldtbus);
                                      j <= SUBORDINATE_LDT_BUS_NUMBER(ldtbus);
                                      j++)
-                                        pci_bus_to_cpumask[j] =
-                                                node_to_cpumask(NODE_ID(nid));
+                                        pci_bus_to_node[j] = NODE_ID(nid);
                         }
                 }
         }
 
-        /* quick sanity check */
-        printed = 0;
-        for (i = 0; i < 256; i++) {
-                if (cpus_empty(pci_bus_to_cpumask[i])) {
-                        pci_bus_to_cpumask[i] = CPU_MASK_ALL;
-                        if (printed)
-                                continue;
-                        printk(KERN_ERR
-                               "k8-bus.c: some busses have empty cpu mask\n");
-                        printed = 1;
-                }
-        }
-
         return 0;
 }