Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sched: Consolidate open coded preemptible() checks

Browse source 
preempt_schedule() and preempt_schedule_context() open
code their preemptability checks.

Use the standard API instead for consolidation.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Li Zhong <zhong@linux.vnet.ibm.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Alex Shi <alex.shi@intel.com>
Cc: Paul Turner <pjt@google.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
This commit is contained in:
Frederic Weisbecker 2013-06-19 23:56:22 +02:00
parent ae920eb242
commit fbb00b568b
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/context_tracking.c
View file

@ -87,10 +87,9 @@ void user_enter(void)
*/ */
void __sched notrace preempt_schedule_context(void) void __sched notrace preempt_schedule_context(void)
{ {
struct thread_info *ti = current_thread_info();
enum ctx_state prev_ctx; enum ctx_state prev_ctx;
if (likely(ti->preempt_count || irqs_disabled())) if (likely(!preemptible()))
return; return;
/* /*

4
kernel/sched/core.c
View file

@ -2510,13 +2510,11 @@ void __sched schedule_preempt_disabled(void)
*/ */
asmlinkage void __sched notrace preempt_schedule(void) asmlinkage void __sched notrace preempt_schedule(void)
{ {
struct thread_info *ti = current_thread_info();
/* /*
* If there is a non-zero preempt_count or interrupts are disabled, * If there is a non-zero preempt_count or interrupts are disabled,
* we do not want to preempt the current task. Just return.. * we do not want to preempt the current task. Just return..
*/ */
if (likely(ti->preempt_count || irqs_disabled())) if (likely(!preemptible()))
return; return;
do { do {