projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] add poison.h and patch primary users
[powerpc.git]
/
kernel
/
cpu.c
diff --git
a/kernel/cpu.c
b/kernel/cpu.c
index
fe2b8d0
..
03dcd98
100644
(file)
--- a/
kernel/cpu.c
+++ b/
kernel/cpu.c
@@
-13,10
+13,10
@@
#include <linux/module.h>
#include <linux/kthread.h>
#include <linux/stop_machine.h>
#include <linux/module.h>
#include <linux/kthread.h>
#include <linux/stop_machine.h>
-#include <
asm/semaphore
.h>
+#include <
linux/mutex
.h>
/* This protects CPUs going up and down... */
/* This protects CPUs going up and down... */
-static DE
CLAR
E_MUTEX(cpucontrol);
+static DE
FIN
E_MUTEX(cpucontrol);
static BLOCKING_NOTIFIER_HEAD(cpu_chain);
static BLOCKING_NOTIFIER_HEAD(cpu_chain);
@@
-30,9
+30,9
@@
static int __lock_cpu_hotplug(int interruptible)
if (lock_cpu_hotplug_owner != current) {
if (interruptible)
if (lock_cpu_hotplug_owner != current) {
if (interruptible)
- ret =
down
_interruptible(&cpucontrol);
+ ret =
mutex_lock
_interruptible(&cpucontrol);
else
else
-
down
(&cpucontrol);
+
mutex_lock
(&cpucontrol);
}
/*
}
/*
@@
-56,7
+56,7
@@
void unlock_cpu_hotplug(void)
{
if (--lock_cpu_hotplug_depth == 0) {
lock_cpu_hotplug_owner = NULL;
{
if (--lock_cpu_hotplug_depth == 0) {
lock_cpu_hotplug_owner = NULL;
-
up
(&cpucontrol);
+
mutex_unlock
(&cpucontrol);
}
}
EXPORT_SYMBOL_GPL(unlock_cpu_hotplug);
}
}
EXPORT_SYMBOL_GPL(unlock_cpu_hotplug);