d1f74e20b5b064a130cd0743a256c2d3cfe84010 turned PREEMPT_ACTIVE modifiers to use raw untraced preempt count operations. Meanwhile this prevents from debugging and tracing preemption disabled if we pull that responsibility to schedule() callers (see following patches).
Is there anything we can do about that? Cc: Linus Torvalds <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]> --- kernel/sched/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index bbef95d..89b165f 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2883,9 +2883,9 @@ void __sched schedule_preempt_disabled(void) static void preempt_schedule_common(void) { do { - __preempt_count_add(PREEMPT_ACTIVE); + preempt_count_add(PREEMPT_ACTIVE); __schedule(); - __preempt_count_sub(PREEMPT_ACTIVE); + preempt_count_sub(PREEMPT_ACTIVE); /* * Check again in case we missed a preemption opportunity @@ -2938,7 +2938,7 @@ asmlinkage __visible void __sched notrace preempt_schedule_context(void) return; do { - __preempt_count_add(PREEMPT_ACTIVE); + preempt_count_add(PREEMPT_ACTIVE); /* * Needs preempt disabled in case user_exit() is traced * and the tracer calls preempt_enable_notrace() causing @@ -2948,7 +2948,7 @@ asmlinkage __visible void __sched notrace preempt_schedule_context(void) __schedule(); exception_exit(prev_ctx); - __preempt_count_sub(PREEMPT_ACTIVE); + preempt_count_sub(PREEMPT_ACTIVE); barrier(); } while (need_resched()); } @@ -2973,11 +2973,11 @@ asmlinkage __visible void __sched preempt_schedule_irq(void) prev_state = exception_enter(); do { - __preempt_count_add(PREEMPT_ACTIVE); + preempt_count_add(PREEMPT_ACTIVE); local_irq_enable(); __schedule(); local_irq_disable(); - __preempt_count_sub(PREEMPT_ACTIVE); + preempt_count_sub(PREEMPT_ACTIVE); /* * Check again in case we missed a preemption opportunity -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
