diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 23:01:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 23:01:11 +0100 |
| commit | 52bb452558a426ba265a19e6eadc66cf95613014 (patch) | |
| tree | fe1fca1336151e14152c2c71dcb2f8bf50d55982 /kernel/pid_namespace.c | |
| parent | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit (diff) | |
| parent | tracing/sched: Check preempt_count() for current when reading task->state (diff) | |
| download | linux-52bb452558a426ba265a19e6eadc66cf95613014.tar.xz linux-52bb452558a426ba265a19e6eadc66cf95613014.zip | |
Merge tag 'trace-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"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 tasks
saved_preempt_count which could hold a stale "PREEMPT_ACTIVE",
instead of using the current preempt_count() call"
* tag 'trace-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/sched: Check preempt_count() for current when reading task->state
ftrace/x86: Update i386 call to prepare_ftrace_return()
Diffstat (limited to 'kernel/pid_namespace.c')
0 files changed, 0 insertions, 0 deletions