diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-17 08:45:06 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-12-14 17:55:33 -0500 |
commit | fa4062e7eae8f484c90b9cdd850b5df39ab0e5a0 (patch) | |
tree | 406659ff701c107cf1c405d6381451bf77df2b78 /lib/kernel_lock.c | |
parent | 9c1721aa4994f6625decbd915241f3a94ee2fe67 (diff) |
bkl: Fixup core_lock fallout
kernel_lock.c emits a warning because a raw spinlock function is used
with a spinlock. Convert BKL to raw_spinlock.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/kernel_lock.c')
-rw-r--r-- | lib/kernel_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel_lock.c b/lib/kernel_lock.c index fdd23cdb53f3..b135d04aa48a 100644 --- a/lib/kernel_lock.c +++ b/lib/kernel_lock.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * | 23 | * |
24 | * Don't use in new code. | 24 | * Don't use in new code. |
25 | */ | 25 | */ |
26 | static __cacheline_aligned_in_smp DEFINE_SPINLOCK(kernel_flag); | 26 | static __cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(kernel_flag); |
27 | 27 | ||
28 | 28 | ||
29 | /* | 29 | /* |
@@ -82,7 +82,7 @@ static inline void __lock_kernel(void) | |||
82 | */ | 82 | */ |
83 | do { | 83 | do { |
84 | preempt_enable(); | 84 | preempt_enable(); |
85 | while (spin_is_locked(&kernel_flag)) | 85 | while (raw_spin_is_locked(&kernel_flag)) |
86 | cpu_relax(); | 86 | cpu_relax(); |
87 | preempt_disable(); | 87 | preempt_disable(); |
88 | } while (!do_raw_spin_trylock(&kernel_flag)); | 88 | } while (!do_raw_spin_trylock(&kernel_flag)); |