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

Commit 97740400 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Hibernate: Drop the check of swap space size for compressed image
  PM / shmobile: fix A3SP suspend method
  PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset
  PM / Domains: Fix build for CONFIG_PM_SLEEP unset
  PM: Make sysrq-o be available for CONFIG_PM unset
parents 408e0578 ee34a370

arch/arm/mach-shmobile/pm-sh7372.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int sh7372_a3sp_suspend(void) 
	 * Serial consoles make use of SCIF hardware located in A3SP,

	 * keep such power domain on if "no_console_suspend" is set.

	 */

	return console_suspend_enabled ? -EBUSY : 0;

	return console_suspend_enabled ? 0 : -EBUSY;

}



struct sh7372_pm_domain sh7372_a3sp = {

drivers/base/power/domain.c

+15 −0
Original line number Diff line number Diff line
@@ -1429,6 +1429,8 @@ static int pm_genpd_default_restore_state(struct device *dev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP



/**

 * pm_genpd_default_suspend - Default "device suspend" for PM domians.

 * @dev: Device to handle.
@@ -1517,6 +1519,19 @@ static int pm_genpd_default_thaw(struct device *dev) 
	return cb ? cb(dev) : pm_generic_thaw(dev);

}



#else /* !CONFIG_PM_SLEEP */



#define pm_genpd_default_suspend	NULL

#define pm_genpd_default_suspend_late	NULL

#define pm_genpd_default_resume_early	NULL

#define pm_genpd_default_resume		NULL

#define pm_genpd_default_freeze		NULL

#define pm_genpd_default_freeze_late	NULL

#define pm_genpd_default_thaw_early	NULL

#define pm_genpd_default_thaw		NULL



#endif /* !CONFIG_PM_SLEEP */



/**

 * pm_genpd_init - Initialize a generic I/O PM domain object.

 * @genpd: PM domain object to initialize.

drivers/base/power/domain_governor.c

+19 −5
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/pm_qos.h>

#include <linux/hrtimer.h>



#ifdef CONFIG_PM_RUNTIME



/**

 * default_stop_ok - Default PM domain governor routine for stopping devices.

 * @dev: Device to check.
@@ -137,16 +139,28 @@ static bool default_power_down_ok(struct dev_pm_domain *pd) 
	return true;

}



struct dev_power_governor simple_qos_governor = {

	.stop_ok = default_stop_ok,

	.power_down_ok = default_power_down_ok,

};



static bool always_on_power_down_ok(struct dev_pm_domain *domain)

{

	return false;

}



#else /* !CONFIG_PM_RUNTIME */



bool default_stop_ok(struct device *dev)

{

	return false;

}



#define default_power_down_ok	NULL

#define always_on_power_down_ok	NULL



#endif /* !CONFIG_PM_RUNTIME */



struct dev_power_governor simple_qos_governor = {

	.stop_ok = default_stop_ok,

	.power_down_ok = default_power_down_ok,

};



/**

 * pm_genpd_gov_always_on - A governor implementing an always-on policy

 */

kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ CFLAGS_REMOVE_irq_work.o = -pg 
endif



obj-y += sched/

obj-y += power/



obj-$(CONFIG_FREEZER) += freezer.o

obj-$(CONFIG_PROFILING) += profile.o
@@ -52,8 +53,6 @@ obj-$(CONFIG_PROVE_LOCKING) += spinlock.o 
obj-$(CONFIG_UID16) += uid16.o

obj-$(CONFIG_MODULES) += module.o

obj-$(CONFIG_KALLSYMS) += kallsyms.o

obj-$(CONFIG_PM) += power/

obj-$(CONFIG_FREEZER) += power/

obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o

obj-$(CONFIG_KEXEC) += kexec.o

obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o

kernel/power/swap.c

+7 −6
Original line number Diff line number Diff line
@@ -773,8 +773,7 @@ static int enough_swap(unsigned int nr_pages, unsigned int flags) 


	pr_debug("PM: Free swap pages: %u\n", free_swap);



	required = PAGES_FOR_IO + ((flags & SF_NOCOMPRESS_MODE) ?

		nr_pages : (nr_pages * LZO_CMP_PAGES) / LZO_UNC_PAGES + 1);

	required = PAGES_FOR_IO + nr_pages;

	return free_swap > required;

}
@@ -802,11 +801,13 @@ int swsusp_write(unsigned int flags) 
		printk(KERN_ERR "PM: Cannot get swap writer\n");

		return error;

	}

	if (flags & SF_NOCOMPRESS_MODE) {

		if (!enough_swap(pages, flags)) {

			printk(KERN_ERR "PM: Not enough free swap\n");

			error = -ENOSPC;

			goto out_finish;

		}

	}

	memset(&snapshot, 0, sizeof(struct snapshot_handle));

	error = snapshot_read_next(&snapshot);

	if (error < PAGE_SIZE) {