PM: Integrate beeping flag with existing acpi_sleep flags
Move "debug during resume from s2ram" into the variable we already use for real-mode flags to simplify code. It also closes nasty trap for the user in acpi_sleep_setup; order of parameters actually mattered there, acpi_sleep=s3_bios,s3_mode doing something different from acpi_sleep=s3_mode,s3_bios. Signed-off-by:Pavel Machek <pavel@suse.cz> Signed-off-by:
Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by:
Andrew Morton <akpm@linux-foundation.org> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
Showing
- arch/i386/kernel/acpi/sleep.c 8 additions, 4 deletionsarch/i386/kernel/acpi/sleep.c
- arch/i386/kernel/acpi/wakeup.S 8 additions, 10 deletionsarch/i386/kernel/acpi/wakeup.S
- arch/x86_64/kernel/acpi/sleep.c 5 additions, 3 deletionsarch/x86_64/kernel/acpi/sleep.c
- arch/x86_64/kernel/acpi/wakeup.S 6 additions, 9 deletionsarch/x86_64/kernel/acpi/wakeup.S
- include/linux/acpi.h 1 addition, 2 deletionsinclude/linux/acpi.h
- kernel/power/main.c 0 additions, 23 deletionskernel/power/main.c
- kernel/sysctl.c 1 addition, 1 deletionkernel/sysctl.c
Loading
Please register or sign in to comment