Tue Sep 13 00:27:15 UTC 2005

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24751

Modified Files:
	.cvsignore kernel-2.6.spec 
	linux-2.6-debug-spinlock-panic.patch 
	linux-2.6-debug-spinlock-taint.patch linux-2.6-diskdump.patch 
	sources upstream 
Added Files:
	patch-2.6.13-git12.bz2.sign 
Removed Files:
	linux-2.6-build-reference-discarded-debug_loc.patch 
	patch-2.6.13-git10.bz2.sign patch-2.6.13-git6.bz2.sign 
	patch-2.6.13-rc7-git3.bz2.sign patch-2.6.13-rc7.bz2.sign 
Log Message:
git12

--- NEW FILE patch-2.6.13-git12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBDJbVWyGugalF9Dw4RAr9dAJ4mQEJz24XWXLRqj1N7UqHTmEyLMACePMgV
rVgPHx4PfvRYAfasjofAwEM=
=2YrF
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- .cvsignore	11 Sep 2005 22:05:04 -0000	1.222
+++ .cvsignore	13 Sep 2005 00:27:12 -0000	1.223
@@ -6,5 +6,4 @@
 temp-*
 kernel-2.6.13
 linux-2.6.13.tar.bz2
-patch-2.6.13-git9.bz2
-patch-2.6.13-git10.bz2
+patch-2.6.13-git12.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1549
retrieving revision 1.1550
diff -u -r1.1549 -r1.1550
--- kernel-2.6.spec	11 Sep 2005 22:05:12 -0000	1.1549
+++ kernel-2.6.spec	13 Sep 2005 00:27:12 -0000	1.1550
@@ -215,7 +215,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.13-git10.bz2
+Patch1: patch-2.6.13-git12.bz2
 #Patch2: patch-2.6.13-rc7-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
@@ -247,8 +247,7 @@
 Patch800: linux-2.6-build-nonintconfig.patch
 Patch801: linux-2.6-build-userspace-headers-warning.patch
 Patch802: linux-2.6-build-qconfig-qt-lib64.patch
-Patch803: linux-2.6-build-reference-discarded-debug_loc.patch
-Patch804: linux-2.6-build-reference-discarded-opd.patch
+Patch803: linux-2.6-build-reference-discarded-opd.patch
 
 Patch810: linux-2.6.11-execshield.patch
 Patch811: linux-2.6.10-x86_64-read-implies-exec32.patch
@@ -615,7 +614,6 @@
 %patch802 -p1
 # reference_discarded additions.
 %patch803 -p1
-%patch804 -p1
 
 # Exec shield 
 %patch810 -p1
@@ -1252,6 +1250,9 @@
 %endif
 
 %changelog
+* Mon Sep 12 2005 Dave Jones <davej at redhat.com>
+- 2.6.13-git12
+
 * Sat Sep 10 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-git10
 

linux-2.6-debug-spinlock-panic.patch:
 spinlock_debug.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-spinlock-panic.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-spinlock-panic.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-spinlock-panic.patch	9 Aug 2005 06:01:21 -0000	1.2
+++ linux-2.6-debug-spinlock-panic.patch	13 Sep 2005 00:27:12 -0000	1.3
@@ -4,115 +4,34 @@
 the user can't install the release. As a worse-case scenario, we have
 a 'dontpanic' boot argument. Douglas Adams would be proud.
 
---- linux-2.6.12/include/linux/spinlock.h~	2005-08-09 01:34:16.000000000 -0400
-+++ linux-2.6.12/include/linux/spinlock.h	2005-08-09 01:39:44.000000000 -0400
-@@ -114,17 +114,26 @@ typedef struct {
- #define CHECK_LOCK(x) \
- 	do { \
- 	 	if ((x)->magic != SPINLOCK_MAGIC) { \
--			printk(KERN_ERR "%s:%d: spin_is_locked on uninitialized spinlock %p. (%s)\n", \
-+			if (nopanic)	\
-+				printk(KERN_ERR "%s:%d: spin_is_locked on uninitialized spinlock %p. (%s)\n", \
-+					__FILE__, __LINE__, (x), print_tainted()); \
-+			else \
-+				panic("%s:%d: spin_is_locked on uninitialized spinlock %p. (%s)\n", \
- 					__FILE__, __LINE__, (x), print_tainted()); \
- 		} \
- 	} while(0)
+--- linux-2.6.13/lib/spinlock_debug.c~	2005-09-12 20:14:31.000000000 -0400
++++ linux-2.6.13/lib/spinlock_debug.c	2005-09-12 20:15:56.000000000 -0400
+@@ -11,6 +11,16 @@
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>
  
- #define _raw_spin_lock(x)		\
- 	do { \
--	 	CHECK_LOCK(x); \
-+	 	CHECK_LOCK(x);	\
- 		if ((x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_lock(%s:%p) already locked by %s/%d. (%s)\n", \
-+			if (nopanic) \
-+				printk("%s:%d: spin_lock(%s:%p) already locked by %s/%d. (%s)\n", \
-+					__FILE__,__LINE__, (x)->module, \
-+					(x), (x)->owner, (x)->oline, print_tainted()); \
-+			else \
-+				panic("%s:%d: spin_lock(%s:%p) already locked by %s/%d. (%s)\n", \
- 					__FILE__,__LINE__, (x)->module, \
- 					(x), (x)->owner, (x)->oline, print_tainted()); \
- 		} \
-@@ -162,7 +171,12 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if ((x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_trylock(%s:%p) already locked by %s/%d.(%s)\n", \
-+	 		if (nopanic)	\
-+				printk("%s:%d: spin_trylock(%s:%p) already locked by %s/%d.(%s)\n", \
-+					__FILE__,__LINE__, (x)->module, \
-+					(x), (x)->owner, (x)->oline, print_tainted()); \
-+	 		else \
-+				panic("%s:%d: spin_trylock(%s:%p) already locked by %s/%d.(%s)\n", \
- 					__FILE__,__LINE__, (x)->module, \
- 					(x), (x)->owner, (x)->oline, print_tainted()); \
- 		} \
-@@ -177,7 +191,12 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if ((x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_unlock_wait(%s:%p) owned by %s/%d. (%s)\n", \
-+			if (nopanic) \
-+				printk("%s:%d: spin_unlock_wait(%s:%p) owned by %s/%d. (%s)\n", \
-+					__FILE__,__LINE__, (x)->module, (x), \
-+					(x)->owner, (x)->oline, print_tainted()); \
-+			else \
-+				panic("%s:%d: spin_unlock_wait(%s:%p) owned by %s/%d. (%s)\n", \
- 					__FILE__,__LINE__, (x)->module, (x), \
- 					(x)->owner, (x)->oline, print_tainted()); \
- 		}\
-@@ -188,7 +207,11 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if (!(x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_unlock(%s:%p) not locked. (%s)\n", \
-+			if (nopanic)	\
-+				printk("%s:%d: spin_unlock(%s:%p) not locked. (%s)\n", \
-+					__FILE__,__LINE__, (x)->module, (x), print_tainted());\
-+			else \
-+				panic("%s:%d: spin_unlock(%s:%p) not locked. (%s)\n", \
- 					__FILE__,__LINE__, (x)->module, (x), print_tainted());\
- 		} \
- 		(x)->lock = 0; \
---- linux-2.6.12/kernel/panic.c~	2005-08-09 01:47:46.000000000 -0400
-+++ linux-2.6.12/kernel/panic.c	2005-08-09 01:47:50.000000000 -0400
-@@ -22,6 +22,7 @@
- 
- int panic_timeout;
- int panic_on_oops;
 +int nopanic;
- int tainted;
- 
- EXPORT_SYMBOL(panic_timeout);
-@@ -36,6 +38,15 @@ static int __init panic_setup(char *str)
- }
- __setup("panic=", panic_setup);
- 
 +static int __init nopanic_setup(char *str)
 +{
 +	nopanic = 1;
 +	return 1;
 +}
-+
 +EXPORT_SYMBOL(nopanic);
 +__setup("dontpanic", nopanic_setup);
 +
- static long no_blink(long time)
- {
- 	return 0;
-
---- linux-2.6.12/include/linux/spinlock.h~	2005-08-09 01:43:12.000000000 -0400
-+++ linux-2.6.12/include/linux/spinlock.h	2005-08-09 01:43:31.000000000 -0400
-@@ -34,6 +34,8 @@
- 
- #define __lockfunc fastcall __attribute__((section(".spinlock.text")))
- 
-+extern int nopanic;
 +
- /*
-  * If CONFIG_SMP is set, pull in the _raw_* definitions
-  */
-
+ static void spin_bug(spinlock_t *lock, const char *msg)
+ {
+ 	static long print_once = 1;
+@@ -31,7 +41,10 @@ static void spin_bug(spinlock_t *lock, c
+ 		/*
+ 		 * We cannot continue on SMP:
+ 		 */
+-//		panic("bad locking");
++		if (nopanic)
++			printk("Bad locking\n");
++		else
++			panic("bad locking");
+ #endif
+ 	}
+ }

linux-2.6-debug-spinlock-taint.patch:
 spinlock_debug.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

Index: linux-2.6-debug-spinlock-taint.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-spinlock-taint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-spinlock-taint.patch	9 Aug 2005 05:51:53 -0000	1.1
+++ linux-2.6-debug-spinlock-taint.patch	13 Sep 2005 00:27:12 -0000	1.2
@@ -1,75 +1,62 @@
 Print info about tainting in the spinlock debug printks.
 
-diff -urNp --exclude-from=/home/davej/.exclude linux-1720/include/linux/spinlock.h linux-1730/include/linux/spinlock.h
---- linux-1720/include/linux/spinlock.h
-+++ linux-1730/include/linux/spinlock.h
-@@ -114,8 +114,8 @@ typedef struct {
- #define CHECK_LOCK(x) \
- 	do { \
- 	 	if ((x)->magic != SPINLOCK_MAGIC) { \
--			printk(KERN_ERR "%s:%d: spin_is_locked on uninitialized spinlock %p.\n", \
--					__FILE__, __LINE__, (x)); \
-+			printk(KERN_ERR "%s:%d: spin_is_locked on uninitialized spinlock %p. (%s)\n", \
-+					__FILE__, __LINE__, (x), print_tainted()); \
- 		} \
- 	} while(0)
+--- linux-2.6.13/lib/spinlock_debug.c~	2005-09-12 20:10:31.000000000 -0400
++++ linux-2.6.13/lib/spinlock_debug.c	2005-09-12 20:13:57.000000000 -0400
+@@ -19,8 +19,8 @@ static void spin_bug(spinlock_t *lock, c
+ 	if (xchg(&print_once, 0)) {
+ 		if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
+ 			owner = lock->owner;
+-		printk("BUG: spinlock %s on CPU#%d, %s/%d\n",
+-			msg, smp_processor_id(), current->comm, current->pid);
++		printk("BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
++			msg, smp_processor_id(), current->comm, current->pid, print_tainted());
+ 		printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n",
+ 			lock, lock->magic,
+ 			owner ? owner->comm : "<none>",
+@@ -77,9 +77,9 @@ static void __spin_lock_debug(spinlock_t
+ 		/* lockup suspected: */
+ 		if (print_once) {
+ 			print_once = 0;
+-			printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n",
++			printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p (%s)\n",
+ 				smp_processor_id(), current->comm, current->pid,
+-					lock);
++					lock, print_tainted());
+ 			dump_stack();
+ 		}
+ 	}
+@@ -119,8 +119,8 @@ static void rwlock_bug(rwlock_t *lock, c
+ 	static long print_once = 1;
  
-@@ -124,9 +124,9 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if ((x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_lock(%s:%p) already locked by %s/%d\n", \
-+			printk("%s:%d: spin_lock(%s:%p) already locked by %s/%d. (%s)\n", \
- 					__FILE__,__LINE__, (x)->module, \
--					(x), (x)->owner, (x)->oline); \
-+					(x), (x)->owner, (x)->oline, print_tainted()); \
- 		} \
- 		(x)->lock = 1; \
- 		(x)->owner = __FILE__; \
-@@ -140,9 +140,9 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if ((x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_is_locked(%s:%p) already locked by %s/%d\n", \
-+			printk("%s:%d: spin_is_locked(%s:%p) already locked by %s/%d.(%s)\n", \
- 					__FILE__,__LINE__, (x)->module, \
--					(x), (x)->owner, (x)->oline); \
-+					(x), (x)->owner, (x)->oline, print_tainted()); \
- 		} \
- 		0; \
- 	})
-@@ -162,9 +162,9 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if ((x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_trylock(%s:%p) already locked by %s/%d\n", \
-+			printk("%s:%d: spin_trylock(%s:%p) already locked by %s/%d.(%s)\n", \
- 					__FILE__,__LINE__, (x)->module, \
--					(x), (x)->owner, (x)->oline); \
-+					(x), (x)->owner, (x)->oline, print_tainted()); \
- 		} \
- 		(x)->lock = 1; \
- 		(x)->owner = __FILE__; \
-@@ -177,9 +177,9 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if ((x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_unlock_wait(%s:%p) owned by %s/%d\n", \
-+			printk("%s:%d: spin_unlock_wait(%s:%p) owned by %s/%d. (%s)\n", \
- 					__FILE__,__LINE__, (x)->module, (x), \
--					(x)->owner, (x)->oline); \
-+					(x)->owner, (x)->oline, print_tainted()); \
- 		}\
- 	} while (0)
- 
-@@ -188,8 +188,8 @@ typedef struct {
- 	 	CHECK_LOCK(x); \
- 		if (!(x)->lock&&(x)->babble) { \
- 			(x)->babble--; \
--			printk("%s:%d: spin_unlock(%s:%p) not locked\n", \
--					__FILE__,__LINE__, (x)->module, (x));\
-+			printk("%s:%d: spin_unlock(%s:%p) not locked. (%s)\n", \
-+					__FILE__,__LINE__, (x)->module, (x), print_tainted());\
- 		} \
- 		(x)->lock = 0; \
- 	} while (0)
+ 	if (xchg(&print_once, 0)) {
+-		printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg,
+-			smp_processor_id(), current->comm, current->pid, lock);
++		printk("BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg,
++			smp_processor_id(), current->comm, current->pid, lock, print_tainted());
+ 		dump_stack();
+ #ifdef CONFIG_SMP
+ 		/*
+@@ -147,9 +147,9 @@ static void __read_lock_debug(rwlock_t *
+ 		/* lockup suspected: */
+ 		if (print_once) {
+ 			print_once = 0;
+-			printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n",
++			printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p (%s)\n",
+ 				smp_processor_id(), current->comm, current->pid,
+-					lock);
++					lock, print_tainted());
+ 			dump_stack();
+ 		}
+ 	}
+@@ -219,9 +219,9 @@ static void __write_lock_debug(rwlock_t 
+ 		/* lockup suspected: */
+ 		if (print_once) {
+ 			print_once = 0;
+-			printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n",
++			printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p (%s)\n",
+ 				smp_processor_id(), current->comm, current->pid,
+-					lock);
++					lock, print_tainted());
+ 			dump_stack();
+ 		}
+ 	}

linux-2.6-diskdump.patch:
 drivers/block/Kconfig          |    5 
 drivers/block/Makefile         |    1 
 drivers/block/diskdump.c       | 1121 +++++++++++++++++++++++++++++++++++++++++
 include/asm-generic/diskdump.h |   13 
 include/asm-i386/diskdump.h    |   55 ++
 include/asm-ia64/diskdump.h    |   63 ++
 include/asm-ppc/diskdump.h     |    6 
 include/asm-ppc64/diskdump.h   |   55 ++
 include/asm-s390/diskdump.h    |    6 
 include/asm-x86_64/diskdump.h  |   44 +
 include/linux/diskdump.h       |  186 ++++++
 include/linux/interrupt.h      |    4 
 include/linux/timer.h          |    3 
 include/linux/workqueue.h      |    3 
 kernel/softirq.c               |   32 +
 kernel/timer.c                 |   44 +
 kernel/workqueue.c             |   34 +
 17 files changed, 1671 insertions(+), 4 deletions(-)

Index: linux-2.6-diskdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-diskdump.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-diskdump.patch	24 Aug 2005 18:42:15 -0000	1.1
+++ linux-2.6-diskdump.patch	13 Sep 2005 00:27:12 -0000	1.2
@@ -1321,18 +1321,19 @@
  #ifdef CONFIG_HOTPLUG_CPU
  static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
  {
-@@ -1588,6 +1618,11 @@ void msleep(unsigned int msecs)
+@@ -1640,6 +1640,12 @@ void msleep(unsigned int msecs)
  {
  	unsigned long timeout = msecs_to_jiffies(msecs) + 1;
  
 +	if (unlikely(crashdump_mode())) {
-+		while (msecs--) udelay(1000);
++		while (msecs--)
++			udelay(1000);
 +		return;
 +	}
 +
- 	while (timeout) {
- 		set_current_state(TASK_UNINTERRUPTIBLE);
- 		timeout = schedule_timeout(timeout);
+ 	while (timeout)
+ 		timeout = schedule_timeout_uninterruptible(timeout);
+ }
 --- /dev/null	2005-07-20 12:00:41.186496416 -0400
 +++ linux-2.6.12/include/asm-ia64/diskdump.h	2005-08-19 16:47:34.231261167 -0400
 @@ -0,0 +1,63 @@


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	11 Sep 2005 22:05:13 -0000	1.166
+++ sources	13 Sep 2005 00:27:12 -0000	1.167
@@ -1,3 +1,2 @@
 560f5fadf59f172973e67939868a4cae  linux-2.6.13.tar.bz2
-56144960e4d8af9531b7b46f3643c267  patch-2.6.13-git9.bz2
-70966c57af5b3e160e5187d6e921b298  patch-2.6.13-git10.bz2
+2d7b40321c2c5b5c361357fb200226ff  patch-2.6.13-git12.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- upstream	11 Sep 2005 22:05:13 -0000	1.154
+++ upstream	13 Sep 2005 00:27:12 -0000	1.155
@@ -1,3 +1,2 @@
 linux-2.6.13.tar.bz2
-patch-2.6.13-git9.bz2
-patch-2.6.13-git10.bz2
+patch-2.6.13-git12.bz2


--- linux-2.6-build-reference-discarded-debug_loc.patch DELETED ---


--- patch-2.6.13-git10.bz2.sign DELETED ---


--- patch-2.6.13-git6.bz2.sign DELETED ---


--- patch-2.6.13-rc7-git3.bz2.sign DELETED ---


--- patch-2.6.13-rc7.bz2.sign DELETED ---


