Revision 52bb452558a426ba265a19e6eadc66cf95613014 authored by Linus Torvalds on 13 December 2014, 22:01:11 UTC, committed by Linus Torvalds on 13 December 2014, 22:01:11 UTC
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()
| File | Mode | Size |
|---|---|---|
| configs | ||
| hpux | ||
| include | ||
| kernel | ||
| lib | ||
| math-emu | ||
| mm | ||
| oprofile | ||
| Kconfig | -rw-r--r-- | 7.9 KB |
| Kconfig.debug | -rw-r--r-- | 513 bytes |
| Makefile | -rw-r--r-- | 4.6 KB |
| defpalo.conf | -rw-r--r-- | 815 bytes |
| install.sh | -rw-r--r-- | 1.6 KB |
| nm | -rw-r--r-- | 194 bytes |
Computing file changes ...
