diff options
author | Mikhail Durnev <mikhail_durnev@mentor.com> | 2014-09-03 13:14:30 +0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-03 16:00:28 +0100 |
commit | af28cada543b658f8737eaae37775ca7d9732cfc (patch) | |
tree | 92101539fdee4bd4e0fb61034758dd4a0f5a0b8a /meta/recipes-kernel/systemtap | |
parent | b02da021b122d969c8b22a1181c7cc3fb8250379 (diff) | |
download | poky-af28cada543b658f8737eaae37775ca7d9732cfc.tar.gz |
systemtap: Fixed probe syscall.sendfile failure
Marked __syscall.compat_sendfile as optional
(From OE-Core rev: 74bfb662246411aa062cd8b2acd37be1bbed39d3)
Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
Signed-off-by: Muzaffar Mahmood <muzaffar_mahmood@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch | 22 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch b/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch new file mode 100644 index 0000000000..f945760fde --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | systemtap: Fixed probe syscall.sendfile failure | ||
2 | |||
3 | compat_sendfile syscall is unavailable in kernels starting version 3.8. | ||
4 | Hence systemtap scripts like 'probe syscall.* { if (target()==pid()) log(name." ".argstr) }' fail. | ||
5 | This problem is solved by marking __syscall.compat_sendfile as optional in tapset/linux/syscalls2.stp | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com> | ||
10 | |||
11 | diff -Naur old/tapset/linux/syscalls2.stp new/tapset/linux/syscalls2.stp | ||
12 | --- old/tapset/linux/syscalls2.stp 2014-04-21 01:28:41.000000000 -0500 | ||
13 | +++ new/tapset/linux/syscalls2.stp 2014-04-21 01:38:14.961233914 -0500 | ||
14 | @@ -1953,7 +1953,7 @@ | ||
15 | # COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, | ||
16 | # compat_loff_t __user *, offset, compat_size_t, count) | ||
17 | # | ||
18 | -probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile | ||
19 | +probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile ? | ||
20 | { | ||
21 | name = "sendfile" | ||
22 | out_fd = __int32($out_fd) | ||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 717d66f738..3e1e80a727 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
@@ -6,6 +6,7 @@ PV = "2.5+git${SRCPV}" | |||
6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ | 6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ |
7 | file://docproc-build-fix.patch \ | 7 | file://docproc-build-fix.patch \ |
8 | file://obsolete_automake_macros.patch \ | 8 | file://obsolete_automake_macros.patch \ |
9 | file://tapset-linux-sendfile-syscall.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | # systemtap doesn't support mips | 12 | # systemtap doesn't support mips |