git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
pci.c
diff --git
a/arch/sparc64/kernel/pci.c
b/arch/sparc64/kernel/pci.c
index
31cc686
..
75032d0
100644
(file)
--- a/
arch/sparc64/kernel/pci.c
+++ b/
arch/sparc64/kernel/pci.c
@@
-41,7
+41,6
@@
asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn,
#else
/* List of all PCI controllers found in the system. */
#else
/* List of all PCI controllers found in the system. */
-spinlock_t pci_controller_lock = SPIN_LOCK_UNLOCKED;
struct pci_controller_info *pci_controller_root = NULL;
/* Each PCI controller found gets a unique index. */
struct pci_controller_info *pci_controller_root = NULL;
/* Each PCI controller found gets a unique index. */
@@
-298,12
+297,9
@@
static void __init pci_controller_probe(void)
static void __init pci_scan_each_controller_bus(void)
{
struct pci_controller_info *p;
static void __init pci_scan_each_controller_bus(void)
{
struct pci_controller_info *p;
- unsigned long flags;
- spin_lock_irqsave(&pci_controller_lock, flags);
for (p = pci_controller_root; p; p = p->next)
p->scan_bus(p);
for (p = pci_controller_root; p; p = p->next)
p->scan_bus(p);
- spin_unlock_irqrestore(&pci_controller_lock, flags);
}
/* Reorder the pci_dev chain, so that onboard devices come first
}
/* Reorder the pci_dev chain, so that onboard devices come first
@@
-351,10
+347,6
@@
static int __init pcibios_init(void)
subsys_initcall(pcibios_init);
subsys_initcall(pcibios_init);
-struct pci_fixup pcibios_fixups[] = {
- { 0 }
-};
-
void pcibios_fixup_bus(struct pci_bus *pbus)
{
struct pci_pbm_info *pbm = pbus->sysdata;
void pcibios_fixup_bus(struct pci_bus *pbus)
{
struct pci_pbm_info *pbm = pbus->sysdata;