rpms/kernel/F-11 kernel.spec, 1.1694, 1.1695 linux-2.6-debug-nmi-timeout.patch, 1.4, 1.5 linux-2.6-debug-taint-vm.patch, 1.23, 1.24

Mon Aug 10 19:46:37 UTC 2009

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv656

Modified Files:
	kernel.spec linux-2.6-debug-nmi-timeout.patch 
	linux-2.6-debug-taint-vm.patch 
Log Message:
fix debug-taint-vm and debug-nmi-timeout


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1694
retrieving revision 1.1695
diff -u -p -r1.1694 -r1.1695

--- kernel.spec	10 Aug 2009 19:38:32 -0000	1.1694
+++ kernel.spec	10 Aug 2009 19:46:36 -0000	1.1695
@@ -1173,8 +1173,8 @@ ApplyPatch linux-2.6-acpi-video-dos.patc
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
-#ApplyPatch linux-2.6-debug-nmi-timeout.patch
-#ApplyPatch linux-2.6-debug-taint-vm.patch
+ApplyPatch linux-2.6-debug-nmi-timeout.patch
+ApplyPatch linux-2.6-debug-taint-vm.patch
 ApplyPatch linux-2.6-debug-spinlock-taint.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch

linux-2.6-debug-nmi-timeout.patch:
 arch/x86/kernel/apic/nmi.c |    2 +-
 lib/Kconfig.debug          |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-nmi-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-debug-nmi-timeout.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-debug-nmi-timeout.patch	15 Jul 2008 13:51:23 -0000	1.4
+++ linux-2.6-debug-nmi-timeout.patch	10 Aug 2009 19:46:36 -0000	1.5
@@ -1,6 +1,8 @@
---- linux-2.6.26.noarch/arch/x86/kernel/nmi.c~	2008-07-14 20:31:14.000000000 -0400
-+++ linux-2.6.26.noarch/arch/x86/kernel/nmi.c	2008-07-14 20:31:38.000000000 -0400
-@@ -416,7 +416,7 @@ nmi_watchdog_tick(struct pt_regs *regs, 
+diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
+index ce4fbfa..2bd9e51 100644
+--- a/arch/x86/kernel/apic/nmi.c
++++ b/arch/x86/kernel/apic/nmi.c
+@@ -436,7 +436,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
  		 * wait a few IRQs (5 seconds) before doing the oops ...
  		 */
  		local_inc(&__get_cpu_var(alert_counter));
@@ -9,9 +11,11 @@
  			/*
  			 * die_nmi will return ONLY if NOTIFY_STOP happens..
  			 */
---- linux-2.6.21.noarch/lib/Kconfig.debug~	2007-07-06 17:05:46.000000000 -0400
-+++ linux-2.6.21.noarch/lib/Kconfig.debug	2007-07-06 17:06:07.000000000 -0400
-@@ -126,6 +126,14 @@ config SCHEDSTATS
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index 3be4b7c..ba45afd 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -245,6 +245,14 @@ config SCHEDSTATS
  	  application, you can say N to avoid the very slight overhead
  	  this adds.
  

linux-2.6-debug-taint-vm.patch:
 kernel/panic.c  |    3 ++-
 mm/page_alloc.c |    5 +++--
 mm/slab.c       |    8 ++++----
 mm/slub.c       |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- linux-2.6-debug-taint-vm.patch	15 Jan 2009 07:38:39 -0000	1.23
+++ linux-2.6-debug-taint-vm.patch	10 Aug 2009 19:46:36 -0000	1.24
@@ -1,28 +1,26 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 2a2ff36..361d852 100644
+index 984b3ec..0b4ea72 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -194,6 +194,7 @@ const char *print_tainted(void)
- 		snprintf(buf, sizeof(buf), "Not tainted");
- 	return(buf);
+@@ -199,6 +199,7 @@ const char *print_tainted(void)
+ 
+ 	return buf;
  }
 +EXPORT_SYMBOL(print_tainted);
  
  int test_taint(unsigned flag)
  {
-@@ -334,8 +335,8 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...)
- 	sprint_symbol(function, caller);
+@@ -350,7 +351,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, struc
+ 	const char *board;
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
--	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
--		line, function);
-+	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
-+		line, function, print_tainted());
+-	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
++	printk(KERN_WARNING "WARNING: at %s:%d %pS() (%s)\n", file, line, caller, print_tainted());
  	board = dmi_get_system_info(DMI_PRODUCT_NAME);
  	if (board)
  		printk(KERN_WARNING "Hardware name: %s\n", board);
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 5675b30..ae3e7ff 100644
+index 480907c..add80e2 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -250,9 +250,10 @@ static void bad_page(struct page *page)
@@ -39,10 +37,10 @@ index 5675b30..ae3e7ff 100644
  	dump_stack();
  out:
 diff --git a/mm/slab.c b/mm/slab.c
-index ddc41f3..bf54397 100644
+index 021d69f..f25d4c3 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
-@@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
+@@ -1867,8 +1867,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
@@ -53,7 +51,7 @@ index ddc41f3..bf54397 100644
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2930,8 +2930,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2939,8 +2939,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -65,10 +63,10 @@ index ddc41f3..bf54397 100644
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 6392ae5..4f6acce 100644
+index 253016d..d23af85 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -435,7 +435,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -431,7 +431,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");


