diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-08-22 15:11:13 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-08-22 15:11:13 -0400 |
| commit | 06c4c51b1bcdfbc1f18eb29bd2ddaf9b8d576813 (patch) | |
| tree | 94a6810b7fee542b3e10d505088aad975e692fa9 | |
| parent | 4615f67ef3741e26ae264c29882b19475edc489c (diff) | |
| download | 4.8-rt-patches-06c4c51b1bcdfbc1f18eb29bd2ddaf9b8d576813.tar.gz | |
tracing: refresh
| -rw-r--r-- | patches/series | 2 | ||||
| -rw-r--r-- | patches/tracing-Account-for-preempt-off-in-preempt_schedule.patch (renamed from patches/tracing-account-for-preempt-off-in-preempt_schedule.patch) | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/patches/series b/patches/series index e1cfa2fa4126e0..f4ceab23eb7005 100644 --- a/patches/series +++ b/patches/series @@ -109,7 +109,7 @@ block-shorten-interrupt-disabled-regions.patch timekeeping-split-jiffies-lock.patch # Tracing -tracing-account-for-preempt-off-in-preempt_schedule.patch +tracing-Account-for-preempt-off-in-preempt_schedule.patch # PTRACE/SIGNAL crap signal-revert-ptrace-preempt-magic.patch diff --git a/patches/tracing-account-for-preempt-off-in-preempt_schedule.patch b/patches/tracing-Account-for-preempt-off-in-preempt_schedule.patch index baa26ea6eb2146..ac33ae2043cbe3 100644 --- a/patches/tracing-account-for-preempt-off-in-preempt_schedule.patch +++ b/patches/tracing-Account-for-preempt-off-in-preempt_schedule.patch @@ -1,6 +1,7 @@ +From 0fe25d6d04bfef8a083633b16a8313c888eba19f Mon Sep 17 00:00:00 2001 From: Steven Rostedt <rostedt@goodmis.org> Date: Thu, 29 Sep 2011 12:24:30 -0500 -Subject: tracing: Account for preempt off in preempt_schedule() +Subject: [PATCH] tracing: Account for preempt off in preempt_schedule() The preempt_schedule() uses the preempt_disable_notrace() version because it can cause infinite recursion by the function tracer as @@ -21,13 +22,12 @@ start and stop the latency tracer for preempt off timings. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Clark Williams <williams@redhat.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> ---- - kernel/sched/core.c | 9 +++++++++ - 1 file changed, 9 insertions(+) +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 404c0784b1fc..4fdf5c5e0ed4 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3348,7 +3348,16 @@ asmlinkage __visible void __sched notrac +@@ -3482,7 +3482,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void) * an infinite recursion. */ prev_ctx = exception_enter(); @@ -43,4 +43,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> + stop_critical_timings(); exception_exit(prev_ctx); - preempt_enable_no_resched_notrace(); + preempt_latency_stop(1); +-- +2.5.0 + |