2545145
--- linux.orig/include/asm-generic/bug.h
2545145
+++ linux/include/asm-generic/bug.h
Dave Jones 10bc23b
@@ -55,6 +55,8 @@ struct bug_entry {
Dave Jones 10bc23b
 #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while(0)
Dave Jones 10bc23b
 #endif
Dave Jones 10bc23b
 
Dave Jones 10bc23b
+void print_hardware_dmi_name(void);
Dave Jones 10bc23b
+
Dave Jones 10bc23b
 /*
Dave Jones 10bc23b
  * WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report
Dave Jones 10bc23b
  * significant issues that need prompt attention if they should ever
2545145
--- linux.orig/kernel/panic.c
2545145
+++ linux/kernel/panic.c
2545145
@@ -391,6 +391,15 @@ void oops_exit(void)
2545145
 	kmsg_dump(KMSG_DUMP_OOPS);
2545145
 }
Dave Jones 10bc23b
 
Dave Jones 10bc23b
+void print_hardware_dmi_name(void)
2545145
+{
2545145
+	const char *board;
2545145
+
2545145
+	board = dmi_get_system_info(DMI_PRODUCT_NAME);
2545145
+	if (board)
2545145
+		printk(KERN_WARNING "Hardware name: %s\n", board);
Dave Jones 10bc23b
+}
Dave Jones 10bc23b
+
2545145
 #ifdef WANT_WARN_ON_SLOWPATH
2545145
 struct slowpath_args {
2545145
 	const char *fmt;
2545145
@@ -400,13 +409,10 @@ struct slowpath_args {
2545145
 static void warn_slowpath_common(const char *file, int line, void *caller,
2545145
 				 unsigned taint, struct slowpath_args *args)
2545145
 {
2545145
-	const char *board;
2545145
-
2545145
 	printk(KERN_WARNING "------------[ cut here ]------------\n");
2545145
 	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
2545145
-	board = dmi_get_system_info(DMI_PRODUCT_NAME);
2545145
-	if (board)
2545145
-		printk(KERN_WARNING "Hardware name: %s\n", board);
Dave Jones 10bc23b
+
Dave Jones 10bc23b
+	print_hardware_dmi_name();
Dave Jones 10bc23b
 
Dave Jones 10bc23b
 	if (args)
Dave Jones 10bc23b
 		vprintk(args->fmt, args->args);
2545145
--- linux.orig/mm/memory.c
2545145
+++ linux/mm/memory.c
2545145
@@ -706,6 +706,8 @@ static void print_bad_pte(struct vm_area
Dave Jones 10bc23b
 		"BUG: Bad page map in process %s  pte:%08llx pmd:%08llx\n",
Dave Jones 10bc23b
 		current->comm,
Dave Jones 10bc23b
 		(long long)pte_val(pte), (long long)pmd_val(*pmd));
Dave Jones 10bc23b
+	print_hardware_dmi_name();
Dave Jones 10bc23b
+
Dave Jones 10bc23b
 	if (page)
Dave Jones 10bc23b
 		dump_page(page);
Dave Jones 10bc23b
 	printk(KERN_ALERT
2545145
--- linux.orig/mm/page_alloc.c
2545145
+++ linux/mm/page_alloc.c
Dave Jones 10bc23b
@@ -321,6 +321,7 @@ static void bad_page(struct page *page)
Dave Jones 10bc23b
 		current->comm, page_to_pfn(page));
Dave Jones 10bc23b
 	dump_page(page);
Dave Jones 10bc23b
 
Dave Jones 10bc23b
+	print_hardware_dmi_name();
Dave Jones 10bc23b
 	print_modules();
Dave Jones 10bc23b
 	dump_stack();
Dave Jones 10bc23b
 out: