Skip to content

Commit

Permalink
[PATCH] Convert kernel/cpu.c to mutexes
Browse files Browse the repository at this point in the history
Convert kernel/cpu.c from semaphore to mutex.

I've reviewed all lock_cpu_hotplug() critical sections, and they all seem to
fit mutex semantics.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Jun 26, 2006
1 parent 1fb00c6 commit 81615b6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions kernel/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
#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... */
static DECLARE_MUTEX(cpucontrol);
static DEFINE_MUTEX(cpucontrol);

static BLOCKING_NOTIFIER_HEAD(cpu_chain);

Expand All @@ -30,9 +30,9 @@ static int __lock_cpu_hotplug(int interruptible)

if (lock_cpu_hotplug_owner != current) {
if (interruptible)
ret = down_interruptible(&cpucontrol);
ret = mutex_lock_interruptible(&cpucontrol);
else
down(&cpucontrol);
mutex_lock(&cpucontrol);
}

/*
Expand All @@ -56,7 +56,7 @@ void unlock_cpu_hotplug(void)
{
if (--lock_cpu_hotplug_depth == 0) {
lock_cpu_hotplug_owner = NULL;
up(&cpucontrol);
mutex_unlock(&cpucontrol);
}
}
EXPORT_SYMBOL_GPL(unlock_cpu_hotplug);
Expand Down

0 comments on commit 81615b6

Please sign in to comment.