rpms/kernel/devel linux-2.6-sysrq-c.patch, NONE, 1.1 kernel-2.6.spec, 1.2576, 1.2577

[fedora-cvs-commits at redhat.com]

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-sysrq-c.patch 
Log Message:
- make sysrq c to "crash" all kernels.


linux-2.6-sysrq-c.patch:
 sysrq.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-sysrq-c.patch ---
--- linux-2.6.17.noarch/drivers/char/sysrq.c.orig	2006-08-01 11:07:43.000000000 -0400
+++ linux-2.6.17.noarch/drivers/char/sysrq.c	2006-08-01 11:09:03.000000000 -0400
@@ -94,11 +94,13 @@
 #define sysrq_unraw_op (*(struct sysrq_key_op *)0)
 #endif /* CONFIG_VT */
 
-#ifdef CONFIG_KEXEC
 static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs,
 				struct tty_struct *tty)
 {
+#ifdef CONFIG_KEXEC
 	crash_kexec(pt_regs);
+#endif
+	*( (char *) 0) = 0;
 }
 static struct sysrq_key_op sysrq_crashdump_op = {
 	.handler	= sysrq_handle_crashdump,
@@ -106,9 +108,6 @@
 	.action_msg	= "Trigger a crashdump",
 	.enable_mask	= SYSRQ_ENABLE_DUMP,
 };
-#else
-#define sysrq_crashdump_op (*(struct sysrq_key_op *)0)
-#endif
 
 static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
 				struct tty_struct *tty)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2576
retrieving revision 1.2577
diff -u -r1.2576 -r1.2577
--- kernel-2.6.spec	19 Aug 2006 17:02:05 -0000	1.2576
+++ kernel-2.6.spec	19 Aug 2006 17:11:39 -0000	1.2577
@@ -275,6 +275,9 @@
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
 
+# enable sysrq-c on all kernels, not only kexec
+Patch20: linux-2.6-sysrq-c.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -716,6 +719,9 @@
 # Rolands utrace ptrace replacement.
 %patch10 -p1
 
+# sysrq works always
+%patch20 -p1
+
 # Architecture patches
 
 #
@@ -1725,6 +1731,7 @@
 - xen big config update.  Every config option is the same than normal kernel
   except MICROCODE, TCG_TPM & CONFIG_DEBUG_SLAB.
 - disable XEN_FRAMEBUFFER & XEN_KEYBOARD.
+- make sysrq c to "crash" all kernels.
 
 * Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
 - NFS 64-bit inode support