fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / sysrq.h

diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 1acdb0b..98a1d8c 100644 (file)
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
@@ -11,84 +11,67 @@
  *     based upon discusions in irc://irc.openprojects.net/#kernelnewbies
  */
 
-#include <linux/config.h>
+#ifndef _LINUX_SYSRQ_H
+#define _LINUX_SYSRQ_H
 
 struct pt_regs;
 struct tty_struct;
 
+/* Possible values of bitmask for enabling sysrq functions */
+/* 0x0001 is reserved for enable everything */
+#define SYSRQ_ENABLE_LOG       0x0002
+#define SYSRQ_ENABLE_KEYBOARD  0x0004
+#define SYSRQ_ENABLE_DUMP      0x0008
+#define SYSRQ_ENABLE_SYNC      0x0010
+#define SYSRQ_ENABLE_REMOUNT   0x0020
+#define SYSRQ_ENABLE_SIGNAL    0x0040
+#define SYSRQ_ENABLE_BOOT      0x0080
+#define SYSRQ_ENABLE_RTNICE    0x0100
+
 struct sysrq_key_op {
-       void (*handler)(int, struct pt_regs *, struct tty_struct *);
+       void (*handler)(int, struct tty_struct *);
        char *help_msg;
        char *action_msg;
+       int enable_mask;
 };
 
 #ifdef CONFIG_MAGIC_SYSRQ
 
-/* Generic SysRq interface -- you may call it from any device driver, supplying
- * ASCII code of the key, pointer to registers and kbd/tty structs (if they
- * are available -- else NULL's).
- */
-
-void handle_sysrq(int, struct pt_regs *, struct tty_struct *);
+extern int sysrq_on(void);
 
-/* 
- * Nonlocking version of handle sysrq, used by sysrq handlers that need to
- * call sysrq handlers
+/*
+ * Do not use this one directly:
  */
+extern int __sysrq_enabled;
 
-void __handle_sysrq_nolock(int, struct pt_regs *, struct tty_struct *);
-
-/*
- * Sysrq registration manipulation functions
+/* Generic SysRq interface -- you may call it from any device driver, supplying
+ * ASCII code of the key, pointer to registers and kbd/tty structs (if they
+ * are available -- else NULL's).
  */
 
-void __sysrq_lock_table (void);
-void __sysrq_unlock_table (void);
-struct sysrq_key_op *__sysrq_get_key_op (int key);
-void __sysrq_put_key_op (int key, struct sysrq_key_op *op_p);
+void handle_sysrq(int key, struct tty_struct *tty);
+void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
+int register_sysrq_key(int key, struct sysrq_key_op *op);
+int unregister_sysrq_key(int key, struct sysrq_key_op *op);
+struct sysrq_key_op *__sysrq_get_key_op(int key);
 
-extern __inline__ int
-__sysrq_swap_key_ops_nolock(int key, struct sysrq_key_op *insert_op_p,
-                               struct sysrq_key_op *remove_op_p)
-{
-       int retval;
-       if (__sysrq_get_key_op(key) == remove_op_p) {
-               __sysrq_put_key_op(key, insert_op_p);
-               retval = 0;
-       } else {
-                retval = -1;
-       }
-       return retval;
-}
-
-extern __inline__ int
-__sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,
-                               struct sysrq_key_op *remove_op_p) {
-       int retval;
-       __sysrq_lock_table();
-       retval = __sysrq_swap_key_ops_nolock(key, insert_op_p, remove_op_p);
-       __sysrq_unlock_table();
-       return retval;
-}
-       
-static inline int register_sysrq_key(int key, struct sysrq_key_op *op_p)
-{
-       return __sysrq_swap_key_ops(key, op_p, NULL);
-}
+#else
 
-static inline int unregister_sysrq_key(int key, struct sysrq_key_op *op_p)
+static inline int sysrq_on(void)
 {
-       return __sysrq_swap_key_ops(key, NULL, op_p);
+       return 0;
 }
-
-#else
-
 static inline int __reterr(void)
 {
        return -EINVAL;
 }
+static inline void handle_sysrq(int key, struct tty_struct *tty)
+{
+}
 
 #define register_sysrq_key(ig,nore) __reterr()
 #define unregister_sysrq_key(ig,nore) __reterr()
 
 #endif
+
+#endif /* _LINUX_SYSRQ_H */