| From 9e7b2269c526f2118b9c24849f9c29bba61dedd2 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 3 Jul 2009 08:30:28 -0500 |
| Subject: [PATCH] trace: rt support |
| |
| commit 46c4efb391333eef9c2ce9aef0cba903da787601 in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c |
| index e599a03..4af5b21 100644 |
| --- a/kernel/trace/trace.c |
| +++ b/kernel/trace/trace.c |
| @@ -272,6 +272,11 @@ void trace_wake_up(void) |
| |
| if (trace_flags & TRACE_ITER_BLOCK) |
| return; |
| + |
| +#ifdef CONFIG_PREEMPT_RT |
| + if (in_atomic() || irqs_disabled()) |
| + return; |
| +#endif |
| /* |
| * The runqueue_is_locked() can fail, but this is the best we |
| * have for now: |
| -- |
| 1.7.1.1 |
| |
