rpms/kernel/devel kernel.spec, 1.309, 1.310 linux-2.6-debug-spinlock-taint.patch, 1.8, 1.9 linux-2.6-debug-taint-vm.patch, 1.16, 1.17

Dave Jones (davej) fedora-extras-commits at redhat.com
Thu Dec 13 22:55:56 UTC 2007


Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28798

Modified Files:
	kernel.spec linux-2.6-debug-spinlock-taint.patch 
	linux-2.6-debug-taint-vm.patch 
Log Message:
lets find out if vmware fixed their emulation.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- kernel.spec	13 Dec 2007 22:38:51 -0000	1.309
+++ kernel.spec	13 Dec 2007 22:55:04 -0000	1.310
@@ -1062,7 +1062,7 @@
 # fix cpqarray pci enable
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 # fix vmware emulated scsi controller
-ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
+#ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # ALSA
 #

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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-debug-spinlock-taint.patch	22 Oct 2007 05:46:46 -0000	1.8
+++ linux-2.6-debug-spinlock-taint.patch	13 Dec 2007 22:55:04 -0000	1.9
@@ -1,5 +1,5 @@
---- linux-2.6.23.noarch/lib/spinlock_debug.c~	2007-10-22 01:15:04.000000000 -0400
-+++ linux-2.6.23.noarch/lib/spinlock_debug.c	2007-10-22 01:17:03.000000000 -0400
+--- linux-2.6/lib/spinlock_debug.c~	2007-10-22 01:15:04.000000000 -0400
++++ linux-2.6/lib/spinlock_debug.c	2007-10-22 01:17:03.000000000 -0400
 @@ -58,9 +58,9 @@ static void spin_bug(spinlock_t *lock, c
  
  	if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)

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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-debug-taint-vm.patch	2 Aug 2007 23:37:31 -0000	1.16
+++ linux-2.6-debug-taint-vm.patch	13 Dec 2007 22:55:04 -0000	1.17
@@ -1,5 +1,5 @@
---- linux-2.6.20.noarch/include/asm-generic/bug.h~	2007-02-12 16:18:21.000000000 -0500
-+++ linux-2.6.20.noarch/include/asm-generic/bug.h	2007-02-12 16:19:57.000000000 -0500
+--- linux-2.6/include/asm-generic/bug.h~	2007-02-12 16:18:21.000000000 -0500
++++ linux-2.6/include/asm-generic/bug.h	2007-02-12 16:19:57.000000000 -0500
 @@ -3,6 +3,10 @@
  
  #include <linux/compiler.h>
@@ -11,23 +11,25 @@
  #ifdef CONFIG_BUG
  
  #ifdef CONFIG_GENERIC_BUG
-@@ -22,7 +26,7 @@ struct bug_entry {
+@@ -22,7 +26,8 @@ struct bug_entry {
  
  #ifndef HAVE_ARCH_BUG
  #define BUG() do { \
 -	printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
-+	printk("BUG: failure at %s:%d/%s()! (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \
++	printk(KERN_ERR "BUG: failure at %s:%d/%s()! (%s)\n",
++		__FILE__, __LINE__, __FUNCTION__, print_tainted()); \
  	panic("BUG!"); \
  } while (0)
  #endif
-@@ -39,8 +39,8 @@ struct bug_entry {
+@@ -39,8 +39,9 @@ struct bug_entry {
  #define WARN_ON(condition) ({						\
  	int __ret_warn_on = !!(condition);				\
  	if (unlikely(__ret_warn_on)) {					\
 -		printk("WARNING: at %s:%d %s()\n", __FILE__,		\
 -			__LINE__, __FUNCTION__);			\
-+		printk("WARNING: at %s:%d %s() (%s)\n", __FILE__,	\
-+			__LINE__, __FUNCTION__, print_tainted());	\
++		printk(KERN_ERR "WARNING: at %s:%d %s() (%s)\n",	\
++			 __FILE__, __LINE__, __FUNCTION__,		\
++			 print_tainted());				\
  		dump_stack();						\
  	}								\
  	unlikely(__ret_warn_on);					\
@@ -42,8 +44,8 @@
  
  void add_taint(unsigned flag)
  {
---- linux-2.6.15/mm/page_alloc.c~	2006-01-07 20:48:33.000000000 -0500
-+++ linux-2.6.15/mm/page_alloc.c	2006-01-07 20:49:24.000000000 -0500
+--- linux-2.6/mm/page_alloc.c~	2006-01-07 20:48:33.000000000 -0500
++++ linux-2.6/mm/page_alloc.c	2006-01-07 20:49:24.000000000 -0500
 @@ -137,12 +137,12 @@ static inline int bad_range(struct zone 
  static void bad_page(struct page *page)
  {
@@ -59,8 +61,8 @@
  	dump_stack();
  	page->flags &= ~(1 << PG_lru	|
  			1 << PG_private |
---- linux-2.6.21.noarch/mm/slab.c~	2007-05-27 22:57:44.000000000 -0400
-+++ linux-2.6.21.noarch/mm/slab.c	2007-05-27 22:58:08.000000000 -0400
+--- linux-2.6/mm/slab.c~	2007-05-27 22:57:44.000000000 -0400
++++ linux-2.6/mm/slab.c	2007-05-27 22:58:08.000000000 -0400
 @@ -1816,8 +1816,8 @@ static void check_poison_obj(struct kmem
  			/* Print header */
  			if (lines == 0) {
@@ -83,8 +85,8 @@
  		for (i = 0;
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
---- linux-2.6.22.noarch/mm/slub.c~	2007-07-20 14:15:05.000000000 -0400
-+++ linux-2.6.22.noarch/mm/slub.c	2007-07-20 14:17:37.000000000 -0400
+--- linux-2.6/mm/slub.c~	2007-07-20 14:15:05.000000000 -0400
++++ linux-2.6/mm/slub.c	2007-07-20 14:17:37.000000000 -0400
 @@ -450,7 +450,7 @@ static void slab_bug(struct kmem_cache *
  	va_end(args);
  	printk(KERN_ERR "========================================"




More information about the fedora-extras-commits mailing list