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.5.x5
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
acpiphp_glue.c
diff --git
a/drivers/pci/hotplug/acpiphp_glue.c
b/drivers/pci/hotplug/acpiphp_glue.c
index
e400e4a
..
e7f4129
100644
(file)
--- a/
drivers/pci/hotplug/acpiphp_glue.c
+++ b/
drivers/pci/hotplug/acpiphp_glue.c
@@
-389,7
+389,7
@@
static void add_host_bridge(acpi_handle *handle, int seg, int bus)
bridge->pci_bus = pci_find_bus(seg, bus);
bridge->pci_bus = pci_find_bus(seg, bus);
-
bridge->res_lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&bridge->res_lock)
;
/* to be overridden when we decode _CRS */
bridge->sub = bridge->bus;
/* to be overridden when we decode _CRS */
bridge->sub = bridge->bus;
@@
-457,7
+457,7
@@
static void add_p2p_bridge(acpi_handle *handle, int seg, int bus, int dev, int f
return;
}
return;
}
-
bridge->res_lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&bridge->res_lock)
;
bridge->bus = bridge->pci_bus->number;
bridge->sub = bridge->pci_bus->subordinate;
bridge->bus = bridge->pci_bus->number;
bridge->sub = bridge->pci_bus->subordinate;