diff options
author | Gary Hade <garyhade@us.ibm.com> | 2008-02-08 14:00:52 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-20 21:47:03 -0700 |
commit | cb3576fa34e36907e292f408cb6c258f4fd112ad (patch) | |
tree | 39756b6a25ba477e0f58e3a4efd125d0953d4296 /drivers/pci/probe.c | |
parent | 21c6847406784fde73ad5ea47c2c3434714d58d1 (diff) | |
download | kernel_samsung_espresso10-cb3576fa34e36907e292f408cb6c258f4fd112ad.zip kernel_samsung_espresso10-cb3576fa34e36907e292f408cb6c258f4fd112ad.tar.gz kernel_samsung_espresso10-cb3576fa34e36907e292f408cb6c258f4fd112ad.tar.bz2 |
PCI: Include PCI domain in PCI bus names on x86/x86_64
The PCI bus names included in /proc/iomem and /proc/ioports are
of the form 'PCI Bus #XX' where XX is the bus number. This patch
changes the naming to 'PCI Bus XXXX:YY' where XXXX is the domain
number and YY is the bus number. For example, PCI bus 14 in
domain 0 will show as 'PCI Bus 0000:14' instead of 'PCI Bus #14'.
This change makes the naming consistent with other architectures
such as ia64 where multiple PCI domain support has been around
longer.
Signed-off-by: Gary Hade <garyhade@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 504f19b..07d5c74 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -631,7 +631,9 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); } - sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number); + sprintf(child->name, + (is_cardbus ? "PCI CardBus %04x:%02x" : "PCI Bus %04x:%02x"), + pci_domain_nr(bus), child->number); /* Has only triggered on CardBus, fixup is in yenta_socket */ while (bus->parent) { |