rpms/kernel/devel kernel.spec, 1.1616, 1.1617 linux-2.6-debug-always-inline-kzalloc.patch, 1.1, 1.2 linux-2.6-debug-nmi-timeout.patch, 1.4, 1.5 linux-2.6-debug-sizeof-structs.patch, 1.6, 1.7 linux-2.6-debug-spinlock-taint.patch, 1.10, 1.11 linux-2.6-debug-taint-vm.patch, 1.23, 1.24 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.2, 1.3

Kyle McMartin kyle at fedoraproject.org
Wed Jul 8 17:29:19 UTC 2009 

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3560

Modified Files:
	kernel.spec linux-2.6-debug-always-inline-kzalloc.patch 
	linux-2.6-debug-nmi-timeout.patch 
	linux-2.6-debug-sizeof-structs.patch 
	linux-2.6-debug-spinlock-taint.patch 
	linux-2.6-debug-taint-vm.patch 
	linux-2.6-debug-vm-would-have-oomkilled.patch 
Log Message:
* Wed Jul 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.54.rc2.git2
- Rebase and re-apply all the Fedora-specific linux-2.6-debug-*
  patches.
- Cull a bunch of upstreamed patches from the spec.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1616
retrieving revision 1.1617
diff -u -p -r1.1616 -r1.1617
--- kernel.spec	8 Jul 2009 16:48:13 -0000	1.1616
+++ kernel.spec	8 Jul 2009 17:28:48 -0000	1.1617
@@ -1139,10 +1139,10 @@ 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-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
 
 #
@@ -1834,6 +1834,11 @@ fi
 # and build.
 
 %changelog
+* Wed Jul 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.54.rc2.git2
+- Rebase and re-apply all the Fedora-specific linux-2.6-debug-*
+  patches.
+- Cull a bunch of upstreamed patches from the spec.
+
 * Wed Jul 08 2009 Steve Dickson <steved at redhat.com>
 - Added NFSD v4 dynamic pseudo root patch which allows
   NFS v3 exports to be mounted by v4 clients.

linux-2.6-debug-always-inline-kzalloc.patch:

Index: linux-2.6-debug-always-inline-kzalloc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-always-inline-kzalloc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-debug-always-inline-kzalloc.patch	1 Sep 2008 17:39:18 -0000	1.1
+++ linux-2.6-debug-always-inline-kzalloc.patch	8 Jul 2009 17:28:48 -0000	1.2
@@ -1,6 +1,17 @@
---- linux-2.6.26.noarch/include/linux/slab.h~	2008-09-01 00:33:55.000000000 -0400
-+++ linux-2.6.26.noarch/include/linux/slab.h	2008-09-01 00:34:19.000000000 -0400
-@@ -272,7 +272,7 @@ static inline void *kmem_cache_zalloc(st
+From 76ec0e2e6d6edf81abc0331d5e7873ef7b2f6019 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Wed, 8 Jul 2009 13:06:01 -0400
+Subject: [PATCH 6/6] fedora: linux-2.6-debug-always-inline-kzalloc.patch
+
+---
+ include/linux/slab.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/linux/slab.h b/include/linux/slab.h
+index 2da8372..d4ef74f 100644
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -310,7 +310,7 @@ static inline void *kmem_cache_zalloc(struct kmem_cache *k, gfp_t flags)
   * @size: how many bytes of memory are required.
   * @flags: the type of memory to allocate (see kmalloc).
   */
@@ -9,3 +20,6 @@
  {
  	return kmalloc(size, flags | __GFP_ZERO);
  }
+-- 
+1.6.2.5
+

linux-2.6-debug-nmi-timeout.patch:

Index: linux-2.6-debug-nmi-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/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	8 Jul 2009 17:28:48 -0000	1.5
@@ -1,6 +1,18 @@
---- 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, 
+From 899dd25ae272c73407c1477ec223982d0b57a668 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Wed, 8 Jul 2009 13:03:06 -0400
+Subject: [PATCH 2/6] fedora: linux-2.6-debug-nmi-timeout.patch
+
+---
+ arch/x86/kernel/apic/nmi.c |    2 +-
+ lib/Kconfig.debug          |    8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
+index b3025b4..e82a450 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 +21,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 12327b2..2790b4f 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.
  
@@ -26,3 +40,6 @@
  config TIMER_STATS
  	bool "Collect kernel timers statistics"
  	depends on DEBUG_KERNEL && PROC_FS
+-- 
+1.6.2.5
+

linux-2.6-debug-sizeof-structs.patch:

Index: linux-2.6-debug-sizeof-structs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-sizeof-structs.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- linux-2.6-debug-sizeof-structs.patch	12 Feb 2008 06:18:04 -0000	1.6
+++ linux-2.6-debug-sizeof-structs.patch	8 Jul 2009 17:28:48 -0000	1.7
@@ -1,6 +1,17 @@
---- linux-2.6/init/main.c~	2006-07-11 02:35:10.000000000 -0400
-+++ linux-2.6/init/main.c	2006-07-11 02:49:01.000000000 -0400
-@@ -350,6 +350,10 @@ static void __init setup_per_cpu_areas(v
+From 3def38bec43d38391d0c9e910dee10317b2ef250 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Wed, 8 Jul 2009 13:01:42 -0400
+Subject: [PATCH 1/6] fedora: linux-2.6-debug-sizeof-structs.patch
+
+---
+ init/main.c |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/init/main.c b/init/main.c
+index 2c5ade7..1c25f08 100644
+--- a/init/main.c
++++ b/init/main.c
+@@ -397,6 +397,10 @@ static void __init setup_per_cpu_areas(void)
  }
  #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */
  
@@ -11,9 +22,7 @@
  /* Called by boot processor to activate the rest. */
  static void __init smp_init(void)
  {
---- linux-2.6.20.noarch/init/main.c~	2007-02-14 11:47:41.000000000 -0500
-+++ linux-2.6.20.noarch/init/main.c	2007-02-14 11:48:39.000000000 -0500
-@@ -403,6 +403,15 @@ static void __init smp_init(void)
+@@ -419,6 +423,15 @@ static void __init smp_init(void)
  	/* Any cleanup work */
  	printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
  	smp_cpus_done(setup_max_cpus);
@@ -29,3 +38,6 @@
  }
  
  #endif
+-- 
+1.6.2.5
+

linux-2.6-debug-spinlock-taint.patch:

Index: linux-2.6-debug-spinlock-taint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-spinlock-taint.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- linux-2.6-debug-spinlock-taint.patch	14 Dec 2007 03:42:44 -0000	1.10
+++ linux-2.6-debug-spinlock-taint.patch	8 Jul 2009 17:28:48 -0000	1.11
@@ -1,3 +1,12 @@
+From 49b12b731b75e2ee406c5b33b89e1baa3fa6b336 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Wed, 8 Jul 2009 13:05:32 -0400
+Subject: [PATCH 4/6] fedora: linux-2.6-debug-spinlock-taint.patch
+
+---
+ lib/spinlock_debug.c |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
 diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
 index 9c4b025..b7a010a 100644
 --- a/lib/spinlock_debug.c
@@ -62,4 +71,6 @@ index 9c4b025..b7a010a 100644
  			dump_stack();
  		}
  	}
+-- 
+1.6.2.5
 

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/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	8 Jul 2009 17:28:48 -0000	1.24
@@ -1,31 +1,42 @@
+From b04c57d9dc889462951312be2ac81ff6c702e954 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Wed, 8 Jul 2009 13:05:09 -0400
+Subject: [PATCH 3/6] fedora: linux-2.6-debug-taint-vm.patch
+
+---
+ kernel/panic.c  |    4 +++-
+ mm/page_alloc.c |    5 +++--
+ mm/slab.c       |    8 ++++----
+ mm/slub.c       |    2 +-
+ 4 files changed, 11 insertions(+), 8 deletions(-)
+
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 2a2ff36..361d852 100644
+index 984b3ec..6d1c3be 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,8 @@ 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 e0f2cdf..21dcbc4 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -250,9 +250,10 @@ static void bad_page(struct page *page)
+@@ -257,9 +257,10 @@ static void bad_page(struct page *page)
  	printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",
  		current->comm, page_to_pfn(page));
  	printk(KERN_ALERT
@@ -39,10 +50,10 @@ index 5675b30..ae3e7ff 100644
  	dump_stack();
  out:
 diff --git a/mm/slab.c b/mm/slab.c
-index ddc41f3..bf54397 100644
+index e74a16e..7bc287e 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
-@@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
+@@ -1803,8 +1803,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
@@ -53,7 +64,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)
+@@ -2902,8 +2902,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 +76,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 819f056..8eff0f4 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -435,7 +435,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -433,7 +433,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");
@@ -77,3 +88,6 @@ index 6392ae5..4f6acce 100644
  	printk(KERN_ERR "----------------------------------------"
  			"-------------------------------------\n\n");
  }
+-- 
+1.6.2.5
+

linux-2.6-debug-vm-would-have-oomkilled.patch:

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-debug-vm-would-have-oomkilled.patch	7 Jan 2009 15:12:40 -0000	1.2
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	8 Jul 2009 17:28:48 -0000	1.3
@@ -1,8 +1,18 @@
+From a0e012e118c2b0eba399e213a7989fd2b880f8b7 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Wed, 8 Jul 2009 13:05:46 -0400
+Subject: [PATCH 5/6] fedora: linux-2.6-debug-vm-would-have-oomkilled.patch
+
+---
+ kernel/sysctl.c |    9 +++++++++
+ mm/oom_kill.c   |   14 ++++++++++++++
+ 2 files changed, 23 insertions(+), 0 deletions(-)
+
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index b2a2d68..3b132ee 100644
+index 98e0232..0cfe3ab 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -67,6 +67,7 @@ extern int sysctl_overcommit_ratio;
+@@ -73,6 +73,7 @@ extern int sysctl_overcommit_ratio;
  extern int sysctl_panic_on_oom;
  extern int sysctl_oom_kill_allocating_task;
  extern int sysctl_oom_dump_tasks;
@@ -10,7 +20,7 @@ index b2a2d68..3b132ee 100644
  extern int max_threads;
  extern int core_uses_pid;
  extern int suid_dumpable;
-@@ -861,6 +862,14 @@ static struct ctl_table vm_table[] = {
+@@ -1031,6 +1032,14 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -26,7 +36,7 @@ index b2a2d68..3b132ee 100644
  		.procname	= "overcommit_ratio",
  		.data		= &sysctl_overcommit_ratio,
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index f255eda..3335a94 100644
+index 175a67a..4ab4bdb 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -31,6 +31,7 @@
@@ -37,9 +47,9 @@ index f255eda..3335a94 100644
  static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
-@@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
+@@ -328,6 +329,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
+ 	if (!p->mm)
  		return;
- 	}
  
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
@@ -50,10 +60,11 @@ index f255eda..3335a94 100644
  	if (verbose)
  		printk(KERN_ERR "Killed process %d (%s)\n",
  				task_pid_nr(p), p->comm);
-@@ -363,6 +370,12 @@ static int oom_kill_task(struct task_struct *p)
- 			return 1;
- 	} while_each_thread(g, q);
- 
+@@ -355,6 +362,13 @@ static int oom_kill_task(struct task_struct *p)
+ 		return 1;
+ 	}
+ 	task_unlock(p);
++
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
 +				task_pid_nr(p), p->comm);
@@ -63,3 +74,6 @@ index f255eda..3335a94 100644
  	__oom_kill_task(p, 1);
  
  	/*
+-- 
+1.6.2.5
+

More information about the scm-commits mailing list