diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/pci/hotplug/ibmphp_hpc.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/ibmphp_hpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c index 1aaf3f32d3cd..f59ed30512b5 100644 --- a/drivers/pci/hotplug/ibmphp_hpc.c +++ b/drivers/pci/hotplug/ibmphp_hpc.c | |||
| @@ -133,8 +133,8 @@ void __init ibmphp_hpc_initvars (void) | |||
| 133 | debug ("%s - Entry\n", __func__); | 133 | debug ("%s - Entry\n", __func__); |
| 134 | 134 | ||
| 135 | mutex_init(&sem_hpcaccess); | 135 | mutex_init(&sem_hpcaccess); |
| 136 | init_MUTEX (&semOperations); | 136 | sema_init(&semOperations, 1); |
| 137 | init_MUTEX_LOCKED (&sem_exit); | 137 | sema_init(&sem_exit, 0); |
| 138 | to_debug = 0; | 138 | to_debug = 0; |
| 139 | 139 | ||
| 140 | debug ("%s - Exit\n", __func__); | 140 | debug ("%s - Exit\n", __func__); |