2012-12-09 22:00:02 +00:00
|
|
|
From 7f76ea38fb54bb982236afdedc8aa8b80275aefd Mon Sep 17 00:00:00 2001
|
2012-07-22 22:17:50 +00:00
|
|
|
From: Steven Rostedt <srostedt@redhat.com>
|
|
|
|
Date: Tue, 17 Jul 2012 10:45:59 -0400
|
2012-12-09 22:00:02 +00:00
|
|
|
Subject: [PATCH 275/290] cpu/rt: Fix cpu_hotplug variable initialization
|
2012-07-22 22:17:50 +00:00
|
|
|
|
|
|
|
The commit "cpu/rt: Rework cpu down for PREEMPT_RT" changed the double
|
|
|
|
meaning of the cpu_hotplug.lock, where it was a spinlock for RT and a
|
|
|
|
mutex for non-RT, to just a mutex for both. But the initialization of
|
|
|
|
the variable was not updated to reflect this change.
|
|
|
|
|
|
|
|
Cc: stable-rt@vger.kernel.org
|
|
|
|
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
|
|
|
|
---
|
|
|
|
kernel/cpu.c | 4 ----
|
|
|
|
1 file changed, 4 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/kernel/cpu.c b/kernel/cpu.c
|
|
|
|
index 0964e93..8f87b72 100644
|
|
|
|
--- a/kernel/cpu.c
|
|
|
|
+++ b/kernel/cpu.c
|
|
|
|
@@ -54,11 +54,7 @@ static struct {
|
|
|
|
int refcount;
|
|
|
|
} cpu_hotplug = {
|
|
|
|
.active_writer = NULL,
|
|
|
|
-#ifdef CONFIG_PREEMPT_RT_FULL
|
|
|
|
- .lock = __SPIN_LOCK_UNLOCKED(cpu_hotplug.lock),
|
|
|
|
-#else
|
|
|
|
.lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
|
|
|
|
-#endif
|
|
|
|
.refcount = 0,
|
|
|
|
};
|
|
|
|
|