From: Ben Hutchings Subject: Include package version along with kernel release in stack traces Date: Tue, 24 Jul 2012 03:13:10 +0100 Forwarded: not-needed For distribution binary packages we assume $DISTRIBUTION_OFFICIAL_BUILD, $DISTRIBUTOR and $DISTRIBUTION_VERSION are set. Index: linux/Makefile =================================================================== --- linux.orig/Makefile +++ linux/Makefile @@ -1087,7 +1087,8 @@ endif # that need to depend on updated CONFIG_* values can be checked here. prepare2: prepare3 outputmakefile asm-generic -prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h +prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h \ + include/generated/package.h $(cmd_crmodverdir) archprepare: archheaders archscripts prepare1 scripts_basic @@ -1139,6 +1140,16 @@ define filechk_version.h echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) endef +ifneq ($(DISTRIBUTION_OFFICIAL_BUILD),) +define filechk_package.h + echo \#define LINUX_PACKAGE_ID \" $(DISTRIBUTOR) $(DISTRIBUTION_VERSION)\" +endef +else +define filechk_package.h + echo \#define LINUX_PACKAGE_ID \"\" +endef +endif + $(version_h): FORCE $(call filechk,version.h) $(Q)rm -f $(old_version_h) @@ -1146,6 +1157,9 @@ $(version_h): FORCE include/generated/utsrelease.h: include/config/kernel.release FORCE $(call filechk,utsrelease.h) +include/generated/package.h: $(srctree)/Makefile FORCE + $(call filechk,package.h) + PHONY += headerdep headerdep: $(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \ Index: linux/arch/x86/um/sysrq_64.c =================================================================== --- linux.orig/arch/x86/um/sysrq_64.c +++ linux/arch/x86/um/sysrq_64.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -17,8 +18,9 @@ void show_regs(struct pt_regs *regs) { printk("\n"); print_modules(); - printk(KERN_INFO "Pid: %d, comm: %.20s %s %s\n", task_pid_nr(current), - current->comm, print_tainted(), init_utsname()->release); + printk(KERN_INFO "Pid: %d, comm: %.20s %s %s%s\n", task_pid_nr(current), + current->comm, print_tainted(), init_utsname()->release, + LINUX_PACKAGE_ID); printk(KERN_INFO "RIP: %04lx:[<%016lx>]\n", PT_REGS_CS(regs) & 0xffff, PT_REGS_IP(regs)); printk(KERN_INFO "RSP: %016lx EFLAGS: %08lx\n", PT_REGS_SP(regs), Index: linux/arch/ia64/kernel/process.c =================================================================== --- linux.orig/arch/ia64/kernel/process.c +++ linux/arch/ia64/kernel/process.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -104,9 +105,9 @@ show_regs (struct pt_regs *regs) print_modules(); printk("\n"); show_regs_print_info(KERN_DEFAULT); - printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", + printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), - init_utsname()->release); + init_utsname()->release, LINUX_PACKAGE_ID); printk("ip is at %pS\n", (void *)ip); printk("unat: %016lx pfs : %016lx rsc : %016lx\n", regs->ar_unat, regs->ar_pfs, regs->ar_rsc); Index: linux/arch/powerpc/kernel/process.c =================================================================== --- linux.orig/arch/powerpc/kernel/process.c +++ linux/arch/powerpc/kernel/process.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -1424,8 +1425,9 @@ void show_regs(struct pt_regs * regs) printk("NIP: "REG" LR: "REG" CTR: "REG"\n", regs->nip, regs->link, regs->ctr); - printk("REGS: %px TRAP: %04lx %s (%s)\n", - regs, regs->trap, print_tainted(), init_utsname()->release); + printk("REGS: %px TRAP: %04lx %s (%s%s)\n", + regs, regs->trap, print_tainted(), init_utsname()->release, + LINUX_PACKAGE_ID); printk("MSR: "REG" ", regs->msr); print_msr_bits(regs->msr); pr_cont(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); Index: linux/kernel/hung_task.c =================================================================== --- linux.orig/kernel/hung_task.c +++ linux/kernel/hung_task.c @@ -21,6 +21,7 @@ #include #include +#include /* * The number of tasks checked: @@ -127,10 +128,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); Index: linux/lib/dump_stack.c =================================================================== --- linux.orig/lib/dump_stack.c +++ linux/lib/dump_stack.c @@ -12,6 +12,7 @@ #include #include #include +#include static char dump_stack_arch_desc_str[128]; @@ -44,13 +45,14 @@ void __init dump_stack_set_arch_desc(con */ void dump_stack_print_info(const char *log_lvl) { - printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s\n", + printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s%s\n", log_lvl, raw_smp_processor_id(), current->pid, current->comm, kexec_crash_loaded() ? "Kdump: loaded " : "", print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), - init_utsname()->version); + init_utsname()->version, + LINUX_PACKAGE_ID); if (dump_stack_arch_desc_str[0] != '\0') printk("%sHardware name: %s\n",