From 0b8b168b15cba6e53128db0c1a8582b12779bdde Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 17 Mar 2014 19:30:58 +0000 Subject: [PATCH] Update to 3.14-rc7 svn path=/dists/trunk/linux-tools/; revision=21159 --- debian/changelog | 2 +- ...e-architecture-specific-signal-numbe.patch | 44 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 debian/patches/perf-trace-Decode-architecture-specific-signal-numbe.patch diff --git a/debian/changelog b/debian/changelog index a19343d45..cc43bb350 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-tools (3.14~rc5-1~exp1) UNRELEASED; urgency=medium +linux-tools (3.14~rc7-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate diff --git a/debian/patches/perf-trace-Decode-architecture-specific-signal-numbe.patch b/debian/patches/perf-trace-Decode-architecture-specific-signal-numbe.patch deleted file mode 100644 index 0146c76a2..000000000 --- a/debian/patches/perf-trace-Decode-architecture-specific-signal-numbe.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Ben Hutchings -Date: Thu, 6 Feb 2014 00:47:06 +0000 -Subject: [PATCH 3/3] perf trace: Decode architecture-specific signal numbers -Forwarded: http://mid.gmane.org/1391648441.3003.101.camel@deadeye.wl.decadent.org.uk - -SIGSTKFLT is not defined on alpha, mips or sparc. -SIGEMT and SIGSWI are defined on some architectures and should be -decoded here if so. - -Fixes: 8bad5b0abfdb ('perf trace: Beautify signal number arg in several syscalls') -Signed-off-by: Ben Hutchings -Cc: ---- - tools/perf/builtin-trace.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c -index 5c32dcf..25ea64c 100644 ---- a/tools/perf/builtin-trace.c -+++ b/tools/perf/builtin-trace.c -@@ -807,7 +807,6 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal - P_SIGNUM(PIPE); - P_SIGNUM(ALRM); - P_SIGNUM(TERM); -- P_SIGNUM(STKFLT); - P_SIGNUM(CHLD); - P_SIGNUM(CONT); - P_SIGNUM(STOP); -@@ -823,6 +822,15 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal - P_SIGNUM(IO); - P_SIGNUM(PWR); - P_SIGNUM(SYS); -+#ifdef SIGEMT -+ P_SIGNUM(EMT); -+#endif -+#ifdef SIGSTKFLT -+ P_SIGNUM(STKFLT); -+#endif -+#ifdef SIGSWI -+ P_SIGNUM(SWI); -+#endif - default: break; - } - diff --git a/debian/patches/series b/debian/patches/series index bb7bb2475..8a0a63bc7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ modpost-symbol-prefix.patch tools-perf-version.patch tools-perf-install.patch usbip-document-tcp-wrappers.patch -perf-trace-Decode-architecture-specific-signal-numbe.patch