aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2005-01-08 17:38:32 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2005-01-08 17:38:32 +0000
commit836d83fb96a484b00f27acd9b41ad8c563715912 (patch)
tree1f1adb2e0c9608899e5af842c3d70d09e8f81965
parent7427e581f1b8450224ccc3af94db71eda4cd6a6f (diff)
downloadxen-836d83fb96a484b00f27acd9b41ad8c563715912.tar.gz
xen-836d83fb96a484b00f27acd9b41ad8c563715912.tar.bz2
xen-836d83fb96a484b00f27acd9b41ad8c563715912.zip
bitkeeper revision 1.1159.170.84 (41e01a98vOonZ_L1cH8hpqMPPdMZBg)
sysrq fix for 2.4.
-rw-r--r--linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c
index 78c46675f5..07aae9d0c6 100644
--- a/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c
@@ -217,7 +217,11 @@ static void __shutdown_handler(void *unused)
static void __sysrq_handler(void *unused)
{
#ifdef CONFIG_MAGIC_SYSRQ
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
handle_sysrq(pending_sysrq, NULL, NULL);
+#else
+ handle_sysrq(pending_sysrq, NULL, NULL, NULL);
+#endif
#endif
pending_sysrq = -1;
}