rpms/kernel-xen/devel linux-2.6-debug-oops-pause.patch, NONE, 1.1.2.1 linux-2.6-debug-spinlock-symbol.patch, NONE, 1.1.2.1 kernel-xen.spec, 1.13.2.11, 1.13.2.12 linux-2.6-x86_64-disable-hotplug-guessing.patch, 1.1.2.1, 1.1.2.2

Fri Dec 16 20:19:11 UTC 2005

Author: quintela

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

Modified Files:
      Tag: private-kernel-xen-2_6_12-1_13_FC5-sct-branch
	kernel-xen.spec 
	linux-2.6-x86_64-disable-hotplug-guessing.patch 
Added Files:
      Tag: private-kernel-xen-2_6_12-1_13_FC5-sct-branch
	linux-2.6-debug-oops-pause.patch 
	linux-2.6-debug-spinlock-symbol.patch 
Log Message:
rebase to rawhide kernel-2.6.14-1.1768

linux-2.6-debug-oops-pause.patch:
 traps.c |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE linux-2.6-debug-oops-pause.patch ---

if we oops, pause for a two minutes..
should help those 'it scrolled off the screen' bugs,
and hopefully give people enough time to grab a digital camera
to take a screenshot of the oops.

(Wow, I'm really getting desperate for better debug data).

--- linux-2.6.14/arch/i386/kernel/traps.c~	2005-12-16 03:00:16.000000000 -0500
+++ linux-2.6.14/arch/i386/kernel/traps.c	2005-12-16 03:07:12.000000000 -0500
@@ -271,6 +271,15 @@ void show_registers(struct pt_regs *regs
 		}
 	}
 	printk("\n");
+	{
+		int i;
+		for (i=120;i>0;i--) {
+			mdelay(1000);
+			touch_nmi_watchdog();
+			printk("Continuing in %d seconds\r", i);
+		}
+		printk("\n");
+	}
 }	
 
 static void handle_BUG(struct pt_regs *regs)

linux-2.6-debug-spinlock-symbol.patch:
 spinlock_debug.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-debug-spinlock-symbol.patch ---
--- linux-2.6.14/lib/spinlock_debug.c~	2005-12-15 20:49:07.000000000 -0500
+++ linux-2.6.14/lib/spinlock_debug.c	2005-12-15 20:49:17.000000000 -0500
@@ -11,6 +11,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/kallsyms.h>
 
 int nopanic;
 static int __init nopanic_setup(char *str)
@@ -32,7 +32,8 @@ static void spin_bug(spinlock_t *lock, c
 			owner = lock->owner;
 		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",
+		print_symbol(" lock: %s", lock);
+		printk("(%p), .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n",
 			lock, lock->magic,
 			owner ? owner->comm : "<none>",
 			owner ? owner->pid : -1,



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.13.2.11
retrieving revision 1.13.2.12
diff -u -r1.13.2.11 -r1.13.2.12
--- kernel-xen.spec	15 Dec 2005 21:42:09 -0000	1.13.2.11
+++ kernel-xen.spec	16 Dec 2005 20:19:07 -0000	1.13.2.12
@@ -306,6 +306,8 @@
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1026: linux-2.6-debug-no-quiet.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
+Patch1028: linux-2.6-debug-spinlock-symbol.patch
+Patch1029: linux-2.6-debug-oops-pause.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -741,6 +743,8 @@
 %patch1025 -p1
 %patch1026 -p1
 %patch1027 -p1
+%patch1028 -p1
+%patch1029 -p1
 
 #
 # Make /dev/mem a need-to-know function 
@@ -1368,6 +1372,10 @@
 %endif
 
 %changelog
+* Fri Dec 16 2005 Dave Jones <davej at redhat.com>
+- If we oops, pause a while before doing anything
+  so that people get a chance to grab the debug info.
+
 * Thu Dec 15 2005 Dave Jones <davej at redhat.com>
 - 2.6.15-rc5-git5
 

linux-2.6-x86_64-disable-hotplug-guessing.patch:
 mpparse.c |    2 +-
 smpboot.c |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

Index: linux-2.6-x86_64-disable-hotplug-guessing.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/Attic/linux-2.6-x86_64-disable-hotplug-guessing.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-x86_64-disable-hotplug-guessing.patch	15 Dec 2005 16:26:37 -0000	1.1.2.1
+++ linux-2.6-x86_64-disable-hotplug-guessing.patch	16 Dec 2005 20:19:07 -0000	1.1.2.2
@@ -8,7 +8,7 @@
  
   	if (additional_cpus == -1) {
 - 		if (disabled_cpus > 0) {
-+ 		if (disabled_cpus > 0)
++ 		if (disabled_cpus >= 0)
   			additional_cpus = disabled_cpus;
 - 		} else {
 - 			additional_cpus = num_processors / 2;
@@ -18,3 +18,14 @@
   	}
  	possible = num_processors + additional_cpus;
  	if (possible > NR_CPUS) 
+--- linux-2.6.14/arch/x86_64/kernel/mpparse.c~	2005-12-16 02:10:58.000000000 -0500
++++ linux-2.6.14/arch/x86_64/kernel/mpparse.c	2005-12-16 02:11:01.000000000 -0500
+@@ -67,7 +67,7 @@ unsigned int boot_cpu_id = -1U;
+ /* Internal processor count */
+ unsigned int num_processors __initdata = 0;
+ 
+-unsigned disabled_cpus __initdata;
++unsigned disabled_cpus __initdata = 0;
+ 
+ /* Bitmask of physically existing CPUs */
+ physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;


