summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-25 11:42:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-25 11:42:54 -0700
commit763e326c8bcded22460fb25def2ed0e2459dcc8d (patch)
tree0ab40e348fd5f139223cae485e798a747c45ebfd /include/acpi
parent4520083852a60cbdb9adc235b94c8f36c177427d (diff)
parente3eea1404f5ff7a2ceb7b5e7ba412a6fd94f2935 (diff)
downloadlinux-763e326c8bcded22460fb25def2ed0e2459dcc8d.tar.bz2
Merge tag 'trace-v4.2-rc2-fix3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull ftrace fix from Steven Rostedt: "Back in 3.16 the ftrace code was redesigned and cleaned up to remove the double iteration list (one for registered ftrace ops, and one for registered "global" ops), to just use one list. That simplified the code but also broke the function tracing filtering on pid. This updates the code to handle the filtering again with the new logic" * tag 'trace-v4.2-rc2-fix3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: ftrace: Fix breakage of set_ftrace_pid
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions