[PATCH] Subject: PATCH: fix numa caused compile warnings

pcibus_to_cpumask expands into more than just an initialiser so gcc
moans about code before variable declarations.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 11 insertions, 5 deletions

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index cc9d65388e62..56a3b397efee 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -44,10 +44,14 @@ pci_config_attr(subsystem_device, "0x%04x\n");
 pci_config_attr(class, "0x%06x\n");
 pci_config_attr(irq, "%u\n");
 
-static ssize_t local_cpus_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t local_cpus_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {               
-        cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
-        int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
+        cpumask_t mask;
+        int len;
+
+        mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
+        len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
         strcat(buf,"\n"); 
         return 1+len;
 }
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 35caec13023a..26a55d08b506 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -72,11 +72,13 @@ void pci_remove_legacy_files(struct pci_bus *bus) { return; }
 /*
  * PCI Bus Class Devices
  */
-static ssize_t pci_bus_show_cpuaffinity(struct class_device *class_dev, char *buf)
+static ssize_t pci_bus_show_cpuaffinity(struct class_device *class_dev,
+                                        char *buf)
 {
-        cpumask_t cpumask = pcibus_to_cpumask(to_pci_bus(class_dev));
         int ret;
+        cpumask_t cpumask;
 
+        cpumask = pcibus_to_cpumask(to_pci_bus(class_dev));
         ret = cpumask_scnprintf(buf, PAGE_SIZE, cpumask);
         if (ret < PAGE_SIZE)
                 buf[ret++] = '\n';