[PATCH 0/2] [GIT PULL] tracing: Fixes old and new

From: Steven Rostedt
Date: Fri Dec 12 2014 - 23:22:37 EST



Linus,

Here's two fixes:

1) Discovered by Fengguang Wu's tests. I changed the parameters to
the function graph x86 prepare_ftrace_return() call but forgot
to update the call from entry_32 (i386 version). This patch corrects
that.

2) I was tracing some code and found that the sched_switch tracepoint
was showing tasks in the INTERRUPTIBLE state as RUNNING. This was
due to the updates to convert preempt_count into a per_cpu variable.
The tracepoint logic was made to use the task's saved_preempt_count
which could hold a stale "PREEMPT_ACTIVE", instead of using the
current preempt_count() call.

Please pull the latest trace-fixes-v3.18 tree, which can be found at:


git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-fixes-v3.18

Tag SHA1: acbe5cd526bb9de84fe73d68f8d7bfcbde8ab9f4
Head SHA1: aee4e5f3d3abb7a2239dd02f6d8fb173413fd02f


Steven Rostedt (Red Hat) (2):
ftrace/x86: Update i386 call to prepare_ftrace_return()
tracing/sched: Check preempt_count() for current when reading task->state

----
arch/x86/kernel/entry_32.S | 6 +++---
include/trace/events/sched.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/