diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 20:06:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 20:06:17 +0400 |
| commit | 8e4bc3dd2ca07d77882eba73cea240aba95a1854 (patch) | |
| tree | da105cd2c4f51c78c401c00d8b399572914694ed /kernel/trace | |
| parent | bd4c3a3441144cd46d1f544046523724c5bc6e94 (diff) | |
| parent | 0d721ceadbeaa24d7f9dd41b3e5e29912327a7e1 (diff) | |
| download | linux-8e4bc3dd2ca07d77882eba73cea240aba95a1854.tar.xz | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Simplify sys_sched_rr_get_interval() system call
sched: Fix potential NULL derference of doms_cur
sched: Fix raciness in runqueue_is_locked()
sched: Re-add lost cpu_allowed check to sched_fair.c::select_task_rq_fair()
sched: Remove unneeded indentation in sched_fair.c::place_entity()
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 861308072d28..a35925d222ba 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -268,12 +268,18 @@ static DEFINE_SPINLOCK(tracing_start_lock); */ void trace_wake_up(void) { + int cpu; + + if (trace_flags & TRACE_ITER_BLOCK) + return; /* * The runqueue_is_locked() can fail, but this is the best we * have for now: */ - if (!(trace_flags & TRACE_ITER_BLOCK) && !runqueue_is_locked()) + cpu = get_cpu(); + if (!runqueue_is_locked(cpu)) wake_up(&trace_wait); + put_cpu(); } static int __init set_buf_size(char *str) |