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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
dump
/
dump_setup.c
diff --git
a/drivers/dump/dump_setup.c
b/drivers/dump/dump_setup.c
index
338f723
..
668b2d0
100644
(file)
--- a/
drivers/dump/dump_setup.c
+++ b/
drivers/dump/dump_setup.c
@@
-740,7
+740,9
@@
static inline void
dump_sysrq_register(void)
{
#ifdef CONFIG_MAGIC_SYSRQ
dump_sysrq_register(void)
{
#ifdef CONFIG_MAGIC_SYSRQ
- register_sysrq_key(DUMP_SYSRQ_KEY, &sysrq_crashdump_op);
+ __sysrq_lock_table();
+ __sysrq_put_key_op(DUMP_SYSRQ_KEY, &sysrq_crashdump_op);
+ __sysrq_unlock_table();
#endif
}
#endif
}
@@
-748,7
+750,10
@@
static inline void
dump_sysrq_unregister(void)
{
#ifdef CONFIG_MAGIC_SYSRQ
dump_sysrq_unregister(void)
{
#ifdef CONFIG_MAGIC_SYSRQ
- unregister_sysrq_key(DUMP_SYSRQ_KEY, &sysrq_crashdump_op);
+ __sysrq_lock_table();
+ if (__sysrq_get_key_op(DUMP_SYSRQ_KEY) == &sysrq_crashdump_op)
+ __sysrq_put_key_op(DUMP_SYSRQ_KEY, NULL);
+ __sysrq_unlock_table();
#endif
}
#endif
}