Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4327edf6 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b4012a98

drivers/pci/pci-sysfs.c

+7 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/pci/probe.c

+4 −2
Original line number Diff line number Diff line
@@ -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';