diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-06-08 19:34:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-08 19:34:40 +0200 |
| commit | 6113e45f831616de98c54a005260223b21bcb6b9 (patch) | |
| tree | 0d56dbfae392f89b33c2ae6a36a5cc1ea1c1c988 /kernel/sched.c | |
| parent | Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent (diff) | |
| parent | tracing: Remove ftrace_preempt_disable/enable (diff) | |
| download | linux-dev-6113e45f831616de98c54a005260223b21bcb6b9.tar.xz linux-dev-6113e45f831616de98c54a005260223b21bcb6b9.zip | |
Merge branch 'tip/perf/core-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index d48408142503..d3c120f1bf53 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -3730,7 +3730,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) * off of preempt_enable. Kernel preemptions off return from interrupt * occur there and call schedule directly. */ -asmlinkage void __sched preempt_schedule(void) +asmlinkage void __sched notrace preempt_schedule(void) { struct thread_info *ti = current_thread_info(); @@ -3742,9 +3742,9 @@ asmlinkage void __sched preempt_schedule(void) return; do { - add_preempt_count(PREEMPT_ACTIVE); + add_preempt_count_notrace(PREEMPT_ACTIVE); schedule(); - sub_preempt_count(PREEMPT_ACTIVE); + sub_preempt_count_notrace(PREEMPT_ACTIVE); /* * Check again in case we missed a preemption opportunity |