Merge branch 'pm-sleep' (639bb92a) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/kernel-parameters.txt

+10 −4

Original line number	Diff line number	Diff line
		@@ -1474,6 +1474,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		js= [HW,JOY] Analog joystick
		See Documentation/input/joystick.txt.

		kaslr/nokaslr [X86]
		Enable/disable kernel and module base offset ASLR
		(Address Space Layout Randomization) if built into
		the kernel. When CONFIG_HIBERNATION is selected,
		kASLR is disabled by default. When kASLR is enabled,
		hibernation will be disabled.

		keepinitrd [HW,ARM]

		kernelcore=nn[KMG] [KNL,X86,IA-64,PPC] This parameter
		@@ -2110,10 +2117,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		noapic [SMP,APIC] Tells the kernel to not make use of any
		IOAPICs that may be present in the system.

		nokaslr [X86]
		Disable kernel and module base offset ASLR (Address
		Space Layout Randomization) if built into the kernel.

		noautogroup Disable scheduler automatic task group creation.

		nobats [PPC] Do not use BATs for mapping kernel lowmem
		@@ -2184,6 +2187,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		in certain environments such as networked servers or
		real-time systems.

		nohibernate [HIBERNATION] Disable hibernation and resume.

		nohz= [KNL] Boottime enable/disable dynamic ticks
		Valid arguments: on, off
		Default: on
		@@ -2980,6 +2985,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		noresume Don't check if there's a hibernation image
		present during boot.
		nocompress Don't compress/decompress hibernation images.
		no Disable hibernation and resume.

		retain_initrd [RAM] Keep initrd memory after extraction

arch/x86/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -1672,7 +1672,6 @@ config RELOCATABLE
		config RANDOMIZE_BASE
		bool "Randomize the address of the kernel image"
		depends on RELOCATABLE
		depends on !HIBERNATION
		default n
		---help---
		Randomizes the physical and virtual address at which the

arch/x86/boot/compressed/aslr.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -289,10 +289,17 @@ unsigned char choose_kernel_location(unsigned char input,
		unsigned long choice = (unsigned long)output;
		unsigned long random;

		#ifdef CONFIG_HIBERNATION
		if (!cmdline_find_option_bool("kaslr")) {
		debug_putstr("KASLR disabled by default...\n");
		goto out;
		}
		#else
		if (cmdline_find_option_bool("nokaslr")) {
		debug_putstr("KASLR disabled...\n");
		debug_putstr("KASLR disabled by cmdline...\n");
		goto out;
		}
		#endif

		/* Record the various known unsafe memory ranges. */
		mem_avoid_init((unsigned long)input, input_size,

include/linux/suspend.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -327,6 +327,7 @@ extern unsigned long get_safe_page(gfp_t gfp_mask);
		extern void hibernation_set_ops(const struct platform_hibernation_ops *ops);
		extern int hibernate(void);
		extern bool system_entering_hibernation(void);
		extern bool hibernation_available(void);
		asmlinkage int swsusp_save(void);
		extern struct pbe *restore_pblist;
		#else /* CONFIG_HIBERNATION */
		@@ -339,6 +340,7 @@ static inline void swsusp_unset_page_free(struct page *p) {}
		static inline void hibernation_set_ops(const struct platform_hibernation_ops *ops) {}
		static inline int hibernate(void) { return -ENOSYS; }
		static inline bool system_entering_hibernation(void) { return false; }
		static inline bool hibernation_available(void) { return false; }
		#endif /* CONFIG_HIBERNATION */

		/* Hibernation and suspend events */

kernel/power/hibernate.c

+36 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@

		static int nocompress;
		static int noresume;
		static int nohibernate;
		static int resume_wait;
		static unsigned int resume_delay;
		static char resume_file[256] = CONFIG_PM_STD_PARTITION;
		@@ -62,6 +63,11 @@ bool freezer_test_done;

		static const struct platform_hibernation_ops *hibernation_ops;

		bool hibernation_available(void)
		{
		return (nohibernate == 0);
		}

		/**
		* hibernation_set_ops - Set the global hibernate operations.
		* @ops: Hibernation operations to use in subsequent hibernation transitions.
		@@ -642,6 +648,11 @@ int hibernate(void)
		{
		int error;

		if (!hibernation_available()) {
		pr_debug("PM: Hibernation not available.\n");
		return -EPERM;
		}

		lock_system_sleep();
		/* The snapshot device should not be opened while we're running */
		if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
		@@ -734,7 +745,7 @@ static int software_resume(void)
		/*
		* If the user said "noresume".. bail out early.
		*/
		if (noresume)
		if (noresume \|\| !hibernation_available())
		return 0;

		/*
		@@ -900,6 +911,9 @@ static ssize_t disk_show(struct kobject kobj, struct kobj_attribute attr,
		int i;
		char *start = buf;

		if (!hibernation_available())
		return sprintf(buf, "[disabled]\n");

		for (i = HIBERNATION_FIRST; i <= HIBERNATION_MAX; i++) {
		if (!hibernation_modes[i])
		continue;
		@@ -934,6 +948,9 @@ static ssize_t disk_store(struct kobject kobj, struct kobj_attribute attr,
		char *p;
		int mode = HIBERNATION_INVALID;

		if (!hibernation_available())
		return -EPERM;

		p = memchr(buf, '\n', n);
		len = p ? p - buf : n;

		@@ -1101,6 +1118,10 @@ static int __init hibernate_setup(char *str)
		noresume = 1;
		else if (!strncmp(str, "nocompress", 10))
		nocompress = 1;
		else if (!strncmp(str, "no", 2)) {
		noresume = 1;
		nohibernate = 1;
		}
		return 1;
		}

		@@ -1125,9 +1146,23 @@ static int __init resumedelay_setup(char *str)
		return 1;
		}

		static int __init nohibernate_setup(char *str)
		{
		noresume = 1;
		nohibernate = 1;
		return 1;
		}

		static int __init kaslr_nohibernate_setup(char *str)
		{
		return nohibernate_setup(str);
		}

		__setup("noresume", noresume_setup);
		__setup("resume_offset=", resume_offset_setup);
		__setup("resume=", resume_setup);
		__setup("hibernate=", hibernate_setup);
		__setup("resumewait", resumewait_setup);
		__setup("resumedelay=", resumedelay_setup);
		__setup("nohibernate", nohibernate_setup);
		__setup("kaslr", kaslr_nohibernate_setup);