From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 12 Oct 2018 10:35:02 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v4.19-rc8~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb81bfb224ced3701bcc7b08f309665bf0549252;p=thirdparty%2Flinux.git

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

Dmitry writes:
  "Input updates for v4.19-rc7

   - we added a few scheduling points into various input interfaces to
     ensure that large writes will not cause RCU stalls
   - fixed configuring PS/2 keyboards as wakeup devices on newer
     platforms
   - added a new Xbox gamepad ID."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: uinput - add a schedule point in uinput_inject_events()
  Input: evdev - add a schedule point in evdev_write()
  Input: mousedev - add a schedule point in mousedev_write()
  Input: i8042 - enable keyboard wakeups by default when s2idle is used
  Input: xpad - add support for Xbox1 PDP Camo series gamepad
---

eb81bfb224ced3701bcc7b08f309665bf0549252
diff --cc kernel/power/suspend.c
index 5342f6fc022e5,be3d0d4776618..0bd595a0b6103
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@@ -58,11 -57,17 +58,17 @@@ EXPORT_SYMBOL_GPL(pm_suspend_global_fla
  
  static const struct platform_suspend_ops *suspend_ops;
  static const struct platform_s2idle_ops *s2idle_ops;
 -static DECLARE_WAIT_QUEUE_HEAD(s2idle_wait_head);
 +static DECLARE_SWAIT_QUEUE_HEAD(s2idle_wait_head);
  
  enum s2idle_states __read_mostly s2idle_state;
 -static DEFINE_SPINLOCK(s2idle_lock);
 +static DEFINE_RAW_SPINLOCK(s2idle_lock);
  
+ bool pm_suspend_via_s2idle(void)
+ {
+ 	return mem_sleep_current == PM_SUSPEND_TO_IDLE;
+ }
+ EXPORT_SYMBOL_GPL(pm_suspend_via_s2idle);
+ 
  void s2idle_set_ops(const struct platform_s2idle_ops *ops)
  {
  	lock_system_sleep();