From 4b2a66e9a3b4c69186df4a69509b13838c2481ce Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Sat, 6 Sep 2008 05:46:42 -0700
Subject: [PATCH] --- yaml --- r: 116710 b: refs/heads/master c:
 93ff68a55aa92180a765d6c51c3303f6200167a6 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/bus.c    | 7 +++++++
 trunk/drivers/pci/pci.h    | 1 +
 trunk/drivers/pci/remove.c | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 16a54f77749c..2b321642fe52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5993760f7fc75b77e4701f1e56dc84c0d6cf18d5
+refs/heads/master: 93ff68a55aa92180a765d6c51c3303f6200167a6
diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c
index 529d9d7727b0..999cc4088b59 100644
--- a/trunk/drivers/pci/bus.c
+++ b/trunk/drivers/pci/bus.c
@@ -151,6 +151,13 @@ void pci_bus_add_devices(struct pci_bus *bus)
 			if (retval)
 				dev_err(&dev->dev, "Error creating cpuaffinity"
 					" file, continuing...\n");
+
+			retval = device_create_file(&child_bus->dev,
+						&dev_attr_cpulistaffinity);
+			if (retval)
+				dev_err(&dev->dev,
+					"Error creating cpulistaffinity"
+					" file, continuing...\n");
 		}
 	}
 }
diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index d807cd786f20..4723b12fb39a 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/drivers/pci/pci.h
@@ -109,6 +109,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev)
 extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
 extern struct device_attribute dev_attr_cpuaffinity;
+extern struct device_attribute dev_attr_cpulistaffinity;
 
 /**
  * pci_match_one_device - Tell if a PCI device structure has a matching
diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c
index bdc2a44d68e1..f94f6d5ae297 100644
--- a/trunk/drivers/pci/remove.c
+++ b/trunk/drivers/pci/remove.c
@@ -73,6 +73,7 @@ void pci_remove_bus(struct pci_bus *pci_bus)
 	up_write(&pci_bus_sem);
 	pci_remove_legacy_files(pci_bus);
 	device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity);
+	device_remove_file(&pci_bus->dev, &dev_attr_cpulistaffinity);
 	device_unregister(&pci_bus->dev);
 }
 EXPORT_SYMBOL(pci_remove_bus);