summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-11-06 16:19:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:20 +0000
commitafd7e24c42c5c490be20548ac1ec441a18ca3c62 (patch)
treea9d3e25100949226f70adc17847f8c4d6685ade4
parent58c76d143d27bc2c32ad05ce09fb26b4101bb347 (diff)
downloadpoky-afd7e24c42c5c490be20548ac1ec441a18ca3c62.tar.gz
systemtap: Upgrade to 2.6 Git Version
Remove backported patch (From OE-Core rev: 89a900cb356504bc56e507412adaf5a0d5043ac9) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch22
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc5
2 files changed, 2 insertions, 25 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
deleted file mode 100644
index f945760fde..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1systemtap: Fixed probe syscall.sendfile failure
2
3compat_sendfile syscall is unavailable in kernels starting version 3.8.
4Hence systemtap scripts like 'probe syscall.* { if (target()==pid()) log(name." ".argstr) }' fail.
5This problem is solved by marking __syscall.compat_sendfile as optional in tapset/linux/syscalls2.stp
6
7Upstream-Status: Pending
8
9Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
10
11diff -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 f81e8baf86..f9a19d964a 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +1,12 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3SRCREV = "8f0fcd995f7f650a2ee0a94539f90c99e6d19e1d" 3SRCREV = "7682e51d2e11a35b2977ba9a85ab42f326b8ff8f"
4PV = "2.5+git${SRCPV}" 4PV = "2.6+git${SRCPV}"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git \ 6SRC_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://system_map_location.patch \ 9 file://system_map_location.patch \
10 file://tapset-linux-sendfile-syscall.patch \
11 file://configure-allow-to-disable-libvirt.patch \ 10 file://configure-allow-to-disable-libvirt.patch \
12 " 11 "
13 12