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>
This commit is contained in:
committed by
Linus Torvalds
parent
5a60d6235c
commit
77afcf78a2
@@ -660,7 +660,7 @@ static ctl_table kern_table[] = {
|
||||
{
|
||||
.ctl_name = KERN_ACPI_VIDEO_FLAGS,
|
||||
.procname = "acpi_video_flags",
|
||||
.data = &acpi_video_flags,
|
||||
.data = &acpi_realmode_flags,
|
||||
.maxlen = sizeof (unsigned long),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_doulongvec_minmax,
|
||||
|
Reference in New Issue
Block a user