diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2012-09-12 05:22:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-09-13 10:52:04 -0400 |
commit | f3e947867478af9a12b9956bcd000ac7613a8a95 (patch) | |
tree | 63fabb89439447e0f72c465e8b8d0852e9deff08 /kernel/sched/sched.h | |
parent | 5ed4f1d96deee82ee92cd1ac1e0108c27e80e9b0 (diff) |
sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW
Now that the last architecture to use this has stopped doing so (ARM,
thanks Catalin!) we can remove this complexity from the scheduler
core.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Link: http://lkml.kernel.org/n/tip-g9p2a1w81xxbrze25v9zpzbf@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
-rw-r--r-- | kernel/sched/sched.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 09871698e80c..7a7db09cfabc 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
@@ -737,11 +737,7 @@ static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next) | |||
737 | */ | 737 | */ |
738 | next->on_cpu = 1; | 738 | next->on_cpu = 1; |
739 | #endif | 739 | #endif |
740 | #ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW | ||
741 | raw_spin_unlock_irq(&rq->lock); | ||
742 | #else | ||
743 | raw_spin_unlock(&rq->lock); | 740 | raw_spin_unlock(&rq->lock); |
744 | #endif | ||
745 | } | 741 | } |
746 | 742 | ||
747 | static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev) | 743 | static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev) |
@@ -755,9 +751,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev) | |||
755 | smp_wmb(); | 751 | smp_wmb(); |
756 | prev->on_cpu = 0; | 752 | prev->on_cpu = 0; |
757 | #endif | 753 | #endif |
758 | #ifndef __ARCH_WANT_INTERRUPTS_ON_CTXSW | ||
759 | local_irq_enable(); | 754 | local_irq_enable(); |
760 | #endif | ||
761 | } | 755 | } |
762 | #endif /* __ARCH_WANT_UNLOCKED_CTXSW */ | 756 | #endif /* __ARCH_WANT_UNLOCKED_CTXSW */ |
763 | 757 | ||