Message ID | 20170910221020.13067-7-hauke@hauke-m.de (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Mon, 2017-09-11 at 00:10 +0200, Hauke Mehrtens wrote: > > +#if LINUX_VERSION_IS_LESS(3,18,0) > +static inline void pm_system_wakeup(void) > +{ > + freeze_wake(); > +} > +#endif freeze_wake() was also "only" added around 3.10 or something like that, so perhaps we should just not backport this at all but version-guard the drivers needing it? I'm not super comfortable with the reduced functionality anyway. johannes -- To unsubscribe from this list: send the line "unsubscribe backports" in
On 09/12/2017 11:35 AM, Johannes Berg wrote: > On Mon, 2017-09-11 at 00:10 +0200, Hauke Mehrtens wrote: >> >> +#if LINUX_VERSION_IS_LESS(3,18,0) >> +static inline void pm_system_wakeup(void) >> +{ >> + freeze_wake(); >> +} >> +#endif > > freeze_wake() was also "only" added around 3.10 or something like that, > so perhaps we should just not backport this at all but version-guard > the drivers needing it? I'm not super comfortable with the reduced > functionality anyway. Hi, This is only used by mwifiex so I am also fine with making mwifiex depend on kernel 3.18 or higher. Will you create a patch and revert mine? Hauke -- To unsubscribe from this list: send the line "unsubscribe backports" in
diff --git a/backport/backport-include/linux/suspend.h b/backport/backport-include/linux/suspend.h new file mode 100644 index 00000000..394b164b --- /dev/null +++ b/backport/backport-include/linux/suspend.h @@ -0,0 +1,12 @@ +#ifndef __BP_LINUX_SUSPEND_H +#define __BP_LINUX_SUSPEND_H +#include_next <linux/suspend.h> + +#if LINUX_VERSION_IS_LESS(3,18,0) +static inline void pm_system_wakeup(void) +{ + freeze_wake(); +} +#endif + +#endif /* __BP_LINUX_SUSPEND_H */
This function was added in kernel 3.18 in commit 068765ba7987e ("PM / sleep: Mechanism for aborting system suspends unconditionally") In our implementation we only call pm_system_wakeup(() and do not handle the abortion of the current suspend process. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/suspend.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 backport/backport-include/linux/suspend.h