mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-30 05:42:46 +01:00
tty/sysrq: alpha: export and use __sysrq_get_key_op()
Export a pointer to the sysrq_get_key_op(). This way we can cleanly unregister it, instead of the current solutions of modifuing it inplace. Since __sysrq_get_key_op() is no longer used externally, let's make it a static function. This patch will allow us to limit access to each and every sysrq op and constify the sysrq handling. Cc: Greg Kroah-Hartman <[email protected]> Cc: Jiri Slaby <[email protected]> Cc: [email protected] Cc: Richard Henderson <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Cc: Matt Turner <[email protected]> Cc: [email protected] Signed-off-by: Emil Velikov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
1 parent
beca62c421
commit
0f1c9688a1
3 files changed
+15
-4
No files matched your search
@@ -430,6 +430,15 @@ register_cpus(void)
|
||||
|
||||
arch_initcall(register_cpus);
|
||||
|
||||
#ifdef CONFIG_MAGIC_SYSRQ
|
||||
static struct sysrq_key_op srm_sysrq_reboot_op = {
|
||||
.handler = machine_halt,
|
||||
.help_msg = "reboot(b)",
|
||||
.action_msg = "Resetting",
|
||||
.enable_mask = SYSRQ_ENABLE_BOOT,
|
||||
};
|
||||
#endif
|
||||
|
||||
void __init
|
||||
setup_arch(char **cmdline_p)
|
||||
{
|
||||
@@ -550,8 +559,8 @@ setup_arch(char **cmdline_p)
|
||||
/* If we're using SRM, make sysrq-b halt back to the prom,
|
||||
not auto-reboot. */
|
||||
if (alpha_using_srm) {
|
||||
struct sysrq_key_op *op = __sysrq_get_key_op('b');
|
||||
op->handler = (void *) machine_halt;
|
||||
unregister_sysrq_key('b', __sysrq_reboot_op);
|
||||
register_sysrq_key('b', &srm_sysrq_reboot_op);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
+3
-1
@@ -172,6 +172,8 @@ static struct sysrq_key_op sysrq_reboot_op = {
|
||||
.enable_mask = SYSRQ_ENABLE_BOOT,
|
||||
};
|
||||
|
||||
struct sysrq_key_op *__sysrq_reboot_op = &sysrq_reboot_op;
|
||||
|
||||
static void sysrq_handle_sync(int key)
|
||||
{
|
||||
emergency_sync();
|
||||
@@ -516,7 +518,7 @@ static int sysrq_key_table_key2index(int key)
|
||||
/*
|
||||
* get and put functions for the table, exposed to modules.
|
||||
*/
|
||||
struct sysrq_key_op *__sysrq_get_key_op(int key)
|
||||
static struct sysrq_key_op *__sysrq_get_key_op(int key)
|
||||
{
|
||||
struct sysrq_key_op *op_p = NULL;
|
||||
int i;
|
||||
|
||||
@@ -47,7 +47,7 @@ void handle_sysrq(int key);
|
||||
void __handle_sysrq(int key, bool 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 struct sysrq_key_op *__sysrq_reboot_op;
|
||||
|
||||
int sysrq_toggle_support(int enable_mask);
|
||||
int sysrq_mask(void);
|
||||
|
||||
Reference in new issue
Block a user