Fix debug patches to build on s390x/ppc

2 files changed, 36 insertions, 31 deletions

diff --git a/debug-bad-pte-dmi.patch b/debug-bad-pte-dmi.patch
index 0552cb34f..eddd595b0 100644
--- a/debug-bad-pte-dmi.patch
+++ b/debug-bad-pte-dmi.patch
@@ -1,6 +1,5 @@
-diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-trees/linux/include/asm-generic/bug.h linux-dj/include/asm-generic/bug.h
---- /home/davej/src/kernel/git-trees/linux/include/asm-generic/bug.h	2013-01-04 18:57:12.604282214 -0500
-+++ linux-dj/include/asm-generic/bug.h	2013-02-28 20:04:37.649304147 -0500
+--- linux.orig/include/asm-generic/bug.h
++++ linux/include/asm-generic/bug.h
 @@ -55,6 +55,8 @@ struct bug_entry {
  #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while(0)
  #endif
@@ -10,40 +9,43 @@ diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-tre
  /*
   * WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report
   * significant issues that need prompt attention if they should ever
-diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-trees/linux/kernel/panic.c linux-dj/kernel/panic.c
---- /home/davej/src/kernel/git-trees/linux/kernel/panic.c	2013-02-26 14:41:18.544116674 -0500
-+++ linux-dj/kernel/panic.c	2013-02-28 20:04:37.666304115 -0500
-@@ -397,16 +397,22 @@ struct slowpath_args {
- 	va_list args;
- };
+--- linux.orig/kernel/panic.c
++++ linux/kernel/panic.c
+@@ -391,6 +391,15 @@ void oops_exit(void)
+ 	kmsg_dump(KMSG_DUMP_OOPS);
+ }
  
--static void warn_slowpath_common(const char *file, int line, void *caller,
--				 unsigned taint, struct slowpath_args *args)
 +void print_hardware_dmi_name(void)
- {
- 	const char *board;
- 
--	printk(KERN_WARNING "------------[ cut here ]------------\n");
--	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
- 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
- 	if (board)
- 		printk(KERN_WARNING "Hardware name: %s\n", board);
++{
++	const char *board;
++
++	board = dmi_get_system_info(DMI_PRODUCT_NAME);
++	if (board)
++		printk(KERN_WARNING "Hardware name: %s\n", board);
 +}
 +
-+static void warn_slowpath_common(const char *file, int line, void *caller,
-+				 unsigned taint, struct slowpath_args *args)
-+{
-+	printk(KERN_WARNING "------------[ cut here ]------------\n");
-+	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
+ #ifdef WANT_WARN_ON_SLOWPATH
+ struct slowpath_args {
+ 	const char *fmt;
+@@ -400,13 +409,10 @@ struct slowpath_args {
+ static void warn_slowpath_common(const char *file, int line, void *caller,
+ 				 unsigned taint, struct slowpath_args *args)
+ {
+-	const char *board;
+-
+ 	printk(KERN_WARNING "------------[ cut here ]------------\n");
+ 	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
+-	board = dmi_get_system_info(DMI_PRODUCT_NAME);
+-	if (board)
+-		printk(KERN_WARNING "Hardware name: %s\n", board);
 +
 +	print_hardware_dmi_name();
  
  	if (args)
  		vprintk(args->fmt, args->args);
-diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-trees/linux/mm/memory.c linux-dj/mm/memory.c
---- /home/davej/src/kernel/git-trees/linux/mm/memory.c	2013-02-26 14:41:18.591116577 -0500
-+++ linux-dj/mm/memory.c	2013-02-28 20:04:37.678304092 -0500
-@@ -705,6 +706,8 @@ static void print_bad_pte(struct vm_area
+--- linux.orig/mm/memory.c
++++ linux/mm/memory.c
+@@ -706,6 +706,8 @@ static void print_bad_pte(struct vm_area
  		"BUG: Bad page map in process %s  pte:%08llx pmd:%08llx\n",
  		current->comm,
  		(long long)pte_val(pte), (long long)pmd_val(*pmd));
@@ -52,8 +54,8 @@ diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-tre
  	if (page)
  		dump_page(page);
  	printk(KERN_ALERT
---- linux-dj/mm/page_alloc.c~	2013-04-11 11:47:12.536675503 -0400
-+++ linux-dj/mm/page_alloc.c	2013-04-11 11:47:16.416667806 -0400
+--- linux.orig/mm/page_alloc.c
++++ linux/mm/page_alloc.c
 @@ -321,6 +321,7 @@ static void bad_page(struct page *page)
  		current->comm, page_to_pfn(page));
  	dump_page(page);
diff --git a/kernel.spec b/kernel.spec
index 15fd4e9e1..e935a6b56 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2273,6 +2273,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Apr 15 2013 Josh Boyer <jwboyer@redhat.com>
+- Fix debug patches to build on s390x/ppc
+
 * Mon Apr 15 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc7.git0.1
 - Linux v3.9-rc7
 - Disable debugging options.