]> err.no Git - linux-2.6/commit
PM: Integrate beeping flag with existing acpi_sleep flags
authorPavel Machek <pavel@suse.cz>
Thu, 19 Jul 2007 08:47:41 +0000 (01:47 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 17:04:43 +0000 (10:04 -0700)
commit77afcf78a2ded9a91838734234949c0ead5feb12
tree76922017855c70d550b40241f8a144f6c098cd04
parent5a60d6235c8352ade8f2699e72fcdfe853730456
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>
arch/i386/kernel/acpi/sleep.c
arch/i386/kernel/acpi/wakeup.S
arch/x86_64/kernel/acpi/sleep.c
arch/x86_64/kernel/acpi/wakeup.S
include/linux/acpi.h
kernel/power/main.c
kernel/sysctl.c