diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 20:25:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 20:25:38 +0200 |
| commit | d6a56ae7ac6121ef99500b3380e98f83a3d9e102 (patch) | |
| tree | 372217920c4cbbf11eb7e332ddfa54e63eaa9d25 /kernel | |
| parent | 079d364b042afbe811c4bb0cb57fcbf4f1cfab6d (diff) | |
| parent | bbdc18a3fb6740619f0d037241c85dc6cd4517aa (diff) | |
Merge branch 'pm-sleep'
* pm-sleep:
properly __init-annotate pm_sysrq_init()
PM / wakeup: Use irqsave/irqrestore for events_lock
PM / Freezer: Fix small typo "regrigerator"
PM / Sleep: Print name of wakeup source that aborts suspend
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/poweroff.c | 2 | ||||
| -rw-r--r-- | kernel/power/process.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c index d52359374e8..68197a4e8fc 100644 --- a/kernel/power/poweroff.c +++ b/kernel/power/poweroff.c @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = { .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; diff --git a/kernel/power/process.c b/kernel/power/process.c index 19db29f6755..87da817f9e1 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -79,7 +79,7 @@ static int try_to_freeze_tasks(bool user_only) /* * We need to retry, but first give the freezing tasks some - * time to enter the regrigerator. + * time to enter the refrigerator. */ msleep(10); } |