aboutsummaryrefslogtreecommitdiff
path: root/kernel/power/poweroff.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/power/poweroff.c')
-rw-r--r--kernel/power/poweroff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index e8b33700627..7ef6866b521 100644
--- a/kernel/power/poweroff.c
+++ b/kernel/power/poweroff.c
@@ -24,7 +24,7 @@ static void do_poweroff(struct work_struct *dummy)
static DECLARE_WORK(poweroff_work, do_poweroff);
-static void handle_poweroff(int key, struct tty_struct *tty)
+static void handle_poweroff(int key)
{
/* run sysrq poweroff on boot cpu */
schedule_work_on(cpumask_first(cpu_online_mask), &poweroff_work);
@@ -32,12 +32,12 @@ static void handle_poweroff(int key, struct tty_struct *tty)
static struct sysrq_key_op sysrq_poweroff_op = {
.handler = handle_poweroff,
- .help_msg = "powerOff",
+ .help_msg = "poweroff(o)",
.action_msg = "Power Off",
.enable_mask = SYSRQ_ENABLE_BOOT,
};
-static int pm_sysrq_init(void)
+static int __init pm_sysrq_init(void)
{
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;