diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:03:29 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:03:29 +0200 |
| commit | d52fdf13377c25e7a5620c6bec406bbf6a46d443 (patch) | |
| tree | bbcce588f5753d3174956324c4265c3235611543 /drivers | |
| parent | 7791bd230c6fe65348456564743f99fa066f00e7 (diff) | |
| parent | 11388c87d2abca1f01975ced28ce9eacea239104 (diff) | |
| download | op-kernel-dev-d52fdf13377c25e7a5620c6bec406bbf6a46d443.zip op-kernel-dev-d52fdf13377c25e7a5620c6bec406bbf6a46d443.tar.gz | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock
PM / Sleep: Add missing static storage class specifiers in main.c
PM / Sleep: Fix build warning in sysfs.c for CONFIG_PM_SLEEP unset
PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.
PM / Sleep: Separate printing suspend times from initcall_debug
PM / Sleep: add knob for printing device resume times
ftrace: Disable function tracing during suspend/resume and hibernation, again
PM / Hibernate: Enable suspend to both for in-kernel hibernation.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/main.c | 12 | ||||
| -rw-r--r-- | drivers/base/power/sysfs.c | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 63048f7..61a891d 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -45,10 +45,10 @@ typedef int (*pm_callback_t)(struct device *); */ LIST_HEAD(dpm_list); -LIST_HEAD(dpm_prepared_list); -LIST_HEAD(dpm_suspended_list); -LIST_HEAD(dpm_late_early_list); -LIST_HEAD(dpm_noirq_list); +static LIST_HEAD(dpm_prepared_list); +static LIST_HEAD(dpm_suspended_list); +static LIST_HEAD(dpm_late_early_list); +static LIST_HEAD(dpm_noirq_list); struct suspend_stats suspend_stats; static DEFINE_MUTEX(dpm_list_mtx); @@ -166,7 +166,7 @@ static ktime_t initcall_debug_start(struct device *dev) { ktime_t calltime = ktime_set(0, 0); - if (initcall_debug) { + if (pm_print_times_enabled) { pr_info("calling %s+ @ %i, parent: %s\n", dev_name(dev), task_pid_nr(current), dev->parent ? dev_name(dev->parent) : "none"); @@ -181,7 +181,7 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime, { ktime_t delta, rettime; - if (initcall_debug) { + if (pm_print_times_enabled) { rettime = ktime_get(); delta = ktime_sub(rettime, calltime); pr_info("call %s+ returned %d after %Ld usecs\n", dev_name(dev), diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c index 48be2ad..b91dc6f 100644 --- a/drivers/base/power/sysfs.c +++ b/drivers/base/power/sysfs.c @@ -474,6 +474,8 @@ static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show, NULL); #endif +#ifdef CONFIG_PM_SLEEP + static ssize_t async_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -500,6 +502,8 @@ static ssize_t async_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR(async, 0644, async_show, async_store); + +#endif #endif /* CONFIG_PM_ADVANCED_DEBUG */ static struct attribute *power_attrs[] = { |
