[linux] 03/11: Add Debian package version to "hung task" log messages
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Jun 4 02:04:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit e6c8b0bdf6a730b59a941a05e4c4b20469f8a76f
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Jun 4 00:02:06 2017 +0100
Add Debian package version to "hung task" log messages
I noticed a couple of bug reports with these messages and unknown
packge version.
---
debian/changelog | 1 +
debian/patches/debian/version.patch | 26 +++++++++++++++++++++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0237d46..aa265ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -413,6 +413,7 @@ linux (4.9.30-1) UNRELEASED; urgency=medium
* uapi: fix linux/if.h userspace compilation errors (see #822393, #824442)
* debian/control: Fix compiler build-dependencies for cross-building
(Closes: #863907)
+ * Add Debian package version to "hung task" log messages
[ Salvatore Bonaccorso ]
* tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch
index 505f0b7..05175bc 100644
--- a/debian/patches/debian/version.patch
+++ b/debian/patches/debian/version.patch
@@ -99,7 +99,7 @@ are set.
#include <asm/pgtable.h>
#include <asm/io.h>
-@@ -1340,8 +1341,9 @@ void show_regs(struct pt_regs * regs)
+@@ -1359,8 +1360,9 @@ void show_regs(struct pt_regs * regs)
printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
regs->nip, regs->link, regs->ctr);
@@ -111,6 +111,30 @@ are set.
printk("MSR: "REG" ", regs->msr);
print_msr_bits(regs->msr);
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
+--- a/kernel/hung_task.c
++++ b/kernel/hung_task.c
+@@ -17,6 +17,7 @@
+ #include <linux/sysctl.h>
+ #include <linux/utsname.h>
+ #include <trace/events/sched.h>
++#include <generated/package.h>
+
+ /*
+ * The number of tasks checked:
+@@ -109,10 +110,11 @@ static void check_hung_task(struct task_
+ sysctl_hung_task_warnings--;
+ pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
+ t->comm, t->pid, timeout);
+- pr_err(" %s %s %.*s\n",
++ pr_err(" %s %s %.*s%s\n",
+ print_tainted(), init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+- init_utsname()->version);
++ init_utsname()->version,
++ LINUX_PACKAGE_ID);
+ pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\""
+ " disables this message.\n");
+ sched_show_task(t);
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -45,6 +45,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list