diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 20:46:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 20:46:45 -0800 |
| commit | 6a177af775d92cff7ef36a681c304dc750dbe121 (patch) | |
| tree | bddde274e76b662d646ece545f6057c3211e4103 /tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc | |
| parent | ae36ce07abbdde3521dc0ef7e32143b88718cd21 (diff) | |
| parent | 3b5bab390181968e403886a45c70f9c13b5b6d29 (diff) | |
| download | linux-6a177af775d92cff7ef36a681c304dc750dbe121.tar.bz2 | |
Merge tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest updates from Shuah Khan:
"This 12 patch update for 4.4-rc1 consists of a new pstore test and
fixes to existing tests"
* tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: breakpoint: Actually build it
selftests: vm: Try harder to allocate huge pages
selftests: Make scripts executable
selftests: kprobe: Choose an always-defined function to probe
selftests: memfd: Stop unnecessary rebuilds
selftests: Add missing #include directives
selftests/seccomp: Be more precise with syscall arguments.
selftests/seccomp: build and pass on arm64
selftests: memfd_test: Revised STACK_SIZE to make it 16-byte aligned
selftests/pstore: add pstore test scripts going with reboot
selftests/pstore: add pstore test script for pre-reboot
selftests: add .gitignore for efivarfs
Diffstat (limited to 'tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc')
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc b/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc index a5a426211129..c3843ed49bf6 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc @@ -5,7 +5,7 @@ echo 0 > events/enable echo > kprobe_events -echo p:myevent do_fork > kprobe_events +echo p:myevent _do_fork > kprobe_events grep myevent kprobe_events test -d events/kprobes/myevent echo > kprobe_events |