diff options
| author | Arnd Bergmann <[email protected]> | 2011-01-25 22:52:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2011-03-05 10:56:00 +0100 |
| commit | 4ba8216cd90560bc402f52076f64d8546e8aefcb (patch) | |
| tree | f64c272085c833b36755b5552a726f21eed3d142 /kernel | |
| parent | ae7eb8979ccfa5e9e888101b9c940f20bd0f4115 (diff) | |
BKL: That's all, folks
This removes the implementation of the big kernel lock,
at last. A lot of people have worked on this in the
past, I so the credit for this patch should be with
everyone who participated in the hunt.
The names on the Cc list are the people that were the
most active in this, according to the recorded git
history, in alphabetical order.
Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Alan Cox <[email protected]>
Cc: Alessio Igor Bogani <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Andrew Hendry <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Eric W. Biederman <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Hans Verkuil <[email protected]>
Acked-by: Ingo Molnar <[email protected]>
Cc: Jan Blunck <[email protected]>
Cc: John Kacur <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Cc: Oliver Neukum <[email protected]>
Cc: Paul Menage <[email protected]>
Acked-by: Thomas Gleixner <[email protected]>
Cc: Trond Myklebust <[email protected]>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 18d38e4ec7ba..827c170c6017 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -32,7 +32,6 @@ #include <linux/init.h> #include <linux/uaccess.h> #include <linux/highmem.h> -#include <linux/smp_lock.h> #include <asm/mmu_context.h> #include <linux/interrupt.h> #include <linux/capability.h> @@ -3945,9 +3944,6 @@ need_resched: rcu_note_context_switch(cpu); prev = rq->curr; - release_kernel_lock(prev); -need_resched_nonpreemptible: - schedule_debug(prev); if (sched_feat(HRTICK)) @@ -4010,9 +4006,6 @@ need_resched_nonpreemptible: post_schedule(rq); - if (unlikely(reacquire_kernel_lock(prev))) - goto need_resched_nonpreemptible; - preempt_enable_no_resched(); if (need_resched()) goto need_resched; @@ -8074,7 +8067,7 @@ static inline int preempt_count_equals(int preempt_offset) { int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth(); - return (nested == PREEMPT_INATOMIC_BASE + preempt_offset); + return (nested == preempt_offset); } void __might_sleep(const char *file, int line, int preempt_offset) |