History

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 / Freezer: Revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too" PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count USB: Update last_busy time after autosuspend fails PM / Runtime: Automatically retry failed autosuspends PM / QoS: Remove redundant check PM / OPP: Fix build when CONFIG_PM_OPP is not set PM / Runtime: Fix runtime accounting calculation error PM / Sleep: Update freezer documentation PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug' PM / Sleep: Fix race between CPU hotplug and freezer ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist

Linus Torvalds committed 15 years ago

Commit 8110efc2 parents 06d8eb1 d6cc76811 files · +125 −27Browse files

Showing the changes to include/linux (3 of 11 files). Show all

Unified · Split

3 files
  1. include/linux/cpu.h +0 −4
  2. include/linux/freezer.h +3 −8
  3. include/linux/opp.h +2 −2
include/linux/cpu.h+0−4
@@ -196,13 +196,9 @@ static inline void cpu_hotplug_driver_unlock(void) · 195 unmodified lines
196#endif /* CONFIG_HOTPLUG_CPU */196#endif /* CONFIG_HOTPLUG_CPU */
197 197
198#ifdef CONFIG_PM_SLEEP_SMP198#ifdef CONFIG_PM_SLEEP_SMP
199extern int suspend_cpu_hotplug;
200
201extern int disable_nonboot_cpus(void);199extern int disable_nonboot_cpus(void);
202extern void enable_nonboot_cpus(void);200extern void enable_nonboot_cpus(void);
203#else /* !CONFIG_PM_SLEEP_SMP */201#else /* !CONFIG_PM_SLEEP_SMP */
204#define suspend_cpu_hotplug 0
205
206static inline int disable_nonboot_cpus(void) { return 0; }202static inline int disable_nonboot_cpus(void) { return 0; }
207static inline void enable_nonboot_cpus(void) {}203static inline void enable_nonboot_cpus(void) {}
208#endif /* !CONFIG_PM_SLEEP_SMP */204#endif /* !CONFIG_PM_SLEEP_SMP */
include/linux/freezer.h+3−8
@@ -143,14 +143,9 @@ static inline void set_freezable_with_signal(void) · 142 unmodified lines
143#define wait_event_freezekillable(wq, condition) \143#define wait_event_freezekillable(wq, condition) \
144({ \144({ \
145 int __retval; \145 int __retval; \
146 do { \146 freezer_do_not_count(); \
147 __retval = wait_event_killable(wq, \147 __retval = wait_event_killable(wq, (condition)); \
148 (condition) || freezing(current)); \148 freezer_count(); \
149 if (__retval && !freezing(current)) \
150 break; \
151 else if (!(condition)) \
152 __retval = -ERESTARTSYS; \
153 } while (try_to_freeze()); \
154 __retval; \149 __retval; \
155})150})
156 151
include/linux/opp.h+2−2
@@ -97,11 +97,11 @@ static inline int opp_disable(struct device *dev, unsigned long freq) · 96 unmodified lines
97 return 0;97 return 0;
98}98}
99 99
100struct srcu_notifier_head *opp_get_notifier(struct device *dev)100static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev)
101{101{
102 return ERR_PTR(-EINVAL);102 return ERR_PTR(-EINVAL);
103}103}
104#endif /* CONFIG_PM */104#endif /* CONFIG_PM_OPP */
105 105
106#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)106#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
107int opp_init_cpufreq_table(struct device *dev,107int opp_init_cpufreq_table(struct device *dev,