git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
s390
/
char
/
ctrlchar.c
diff --git
a/drivers/s390/char/ctrlchar.c
b/drivers/s390/char/ctrlchar.c
index
be46324
..
c6cbcb3
100644
(file)
--- a/
drivers/s390/char/ctrlchar.c
+++ b/
drivers/s390/char/ctrlchar.c
@@
-7,7
+7,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/stddef.h>
#include <asm/errno.h>
#include <linux/sysrq.h>
#include <linux/stddef.h>
#include <asm/errno.h>
#include <linux/sysrq.h>
@@
-17,14
+16,15
@@
#ifdef CONFIG_MAGIC_SYSRQ
static int ctrlchar_sysrq_key;
#ifdef CONFIG_MAGIC_SYSRQ
static int ctrlchar_sysrq_key;
+static struct tty_struct *sysrq_tty;
static void
static void
-ctrlchar_handle_sysrq(
void *tty
)
+ctrlchar_handle_sysrq(
struct work_struct *work
)
{
{
- handle_sysrq(ctrlchar_sysrq_key,
NULL, (struct tty_struct *)
tty);
+ handle_sysrq(ctrlchar_sysrq_key,
sysrq_
tty);
}
}
-static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq
, 0
);
+static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq);
#endif
#endif
@@
-54,7
+54,7
@@
ctrlchar_handle(const unsigned char *buf, int len, struct tty_struct *tty)
/* racy */
if (len == 3 && buf[1] == '-') {
ctrlchar_sysrq_key = buf[2];
/* racy */
if (len == 3 && buf[1] == '-') {
ctrlchar_sysrq_key = buf[2];
-
ctrlchar_work.data
= tty;
+
sysrq_tty
= tty;
schedule_work(&ctrlchar_work);
return CTRLCHAR_SYSRQ;
}
schedule_work(&ctrlchar_work);
return CTRLCHAR_SYSRQ;
}