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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
rpadlpar_core.c
diff --git
a/drivers/pci/hotplug/rpadlpar_core.c
b/drivers/pci/hotplug/rpadlpar_core.c
index
46825fe
..
3eefe2c
100644
(file)
--- a/
drivers/pci/hotplug/rpadlpar_core.c
+++ b/
drivers/pci/hotplug/rpadlpar_core.c
@@
-19,7
+19,7
@@
#include <linux/string.h>
#include <asm/pci-bridge.h>
#include <linux/string.h>
#include <asm/pci-bridge.h>
-#include <
linux/mutex
.h>
+#include <
asm/semaphore
.h>
#include <asm/rtas.h>
#include <asm/vio.h>
#include <asm/rtas.h>
#include <asm/vio.h>
@@
-27,7
+27,7
@@
#include "rpaphp.h"
#include "rpadlpar.h"
#include "rpaphp.h"
#include "rpadlpar.h"
-static DE
FINE_MUTEX(rpadlpar_mutex
);
+static DE
CLARE_MUTEX(rpadlpar_sem
);
#define DLPAR_MODULE_NAME "rpadlpar_io"
#define DLPAR_MODULE_NAME "rpadlpar_io"
@@
-300,7
+300,7
@@
int dlpar_add_slot(char *drc_name)
int node_type;
int rc = -EIO;
int node_type;
int rc = -EIO;
- if (
mutex_lock_interruptible(&rpadlpar_mutex
))
+ if (
down_interruptible(&rpadlpar_sem
))
return -ERESTARTSYS;
/* Find newly added node */
return -ERESTARTSYS;
/* Find newly added node */
@@
-324,7
+324,7
@@
int dlpar_add_slot(char *drc_name)
printk(KERN_INFO "%s: slot %s added\n", DLPAR_MODULE_NAME, drc_name);
exit:
printk(KERN_INFO "%s: slot %s added\n", DLPAR_MODULE_NAME, drc_name);
exit:
-
mutex_unlock(&rpadlpar_mutex
);
+
up(&rpadlpar_sem
);
return rc;
}
return rc;
}
@@
-417,7
+417,7
@@
int dlpar_remove_slot(char *drc_name)
int node_type;
int rc = 0;
int node_type;
int rc = 0;
- if (
mutex_lock_interruptible(&rpadlpar_mutex
))
+ if (
down_interruptible(&rpadlpar_sem
))
return -ERESTARTSYS;
dn = find_dlpar_node(drc_name, &node_type);
return -ERESTARTSYS;
dn = find_dlpar_node(drc_name, &node_type);
@@
-439,7
+439,7
@@
int dlpar_remove_slot(char *drc_name)
}
printk(KERN_INFO "%s: slot %s removed\n", DLPAR_MODULE_NAME, drc_name);
exit:
}
printk(KERN_INFO "%s: slot %s removed\n", DLPAR_MODULE_NAME, drc_name);
exit:
-
mutex_unlock(&rpadlpar_mutex
);
+
up(&rpadlpar_sem
);
return rc;
}
return rc;
}