Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b0795c authored May 10, 2011 by Amerigo Wang Committed by Rafael J. Wysocki May 17, 2011

PM / ACPI: Remove acpi_sleep=s4_nonvs



acpi_sleep=s4_nonvs is superseded by acpi_sleep=nonvs, so remove it.

Signed-off-by: WANG Cong <amwang@redhat.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Len Brown <lenb@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

parent e762318b

Documentation/feature-removal-schedule.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -460,14 +460,6 @@ Who: Thomas Gleixner <tglx@linutronix.de>

		----------------------------

		What: The acpi_sleep=s4_nonvs command line option
		When: 2.6.37
		Files: arch/x86/kernel/acpi/sleep.c
		Why: superseded by acpi_sleep=nonvs
		Who: Rafael J. Wysocki <rjw@sisk.pl>

		----------------------------

		What: PCI DMA unmap state API
		When: August 2012
		Why: PCI DMA unmap state API (include/linux/pci-dma.h) was replaced

Documentation/kernel-parameters.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

		acpi_sleep= [HW,ACPI] Sleep options
		Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
		old_ordering, s4_nonvs, sci_force_enable }
		old_ordering, nonvs, sci_force_enable }
		See Documentation/power/video.txt for information on
		s3_bios and s3_mode.
		s3_beep is for debugging; it makes the PC's speaker beep

arch/x86/kernel/acpi/sleep.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -112,11 +112,6 @@ static int __init acpi_sleep_setup(char *str)
		#ifdef CONFIG_HIBERNATION
		if (strncmp(str, "s4_nohwsig", 10) == 0)
		acpi_no_s4_hw_signature();
		if (strncmp(str, "s4_nonvs", 8) == 0) {
		pr_warning("ACPI: acpi_sleep=s4_nonvs is deprecated, "
		"please use acpi_sleep=nonvs instead");
		acpi_nvs_nosave();
		}
		#endif
		if (strncmp(str, "nonvs", 5) == 0)
		acpi_nvs_nosave();