Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for v4.6-rc3

Here are some new device ids.

Signed-off-by: Johan Hovold <johan@kernel.org>

1 files changed, 18 insertions, 0 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d8465eeab8b3..8b489fcac37b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -321,6 +321,24 @@ static inline void init_hrtick(void)
 }
 #endif  /* CONFIG_SCHED_HRTICK */
 
+/*
+ * cmpxchg based fetch_or, macro so it works for different integer types
+ */
+#define fetch_or(ptr, mask)                                             \
+        ({                                                              \
+                typeof(ptr) _ptr = (ptr);                               \
+                typeof(mask) _mask = (mask);                            \
+                typeof(*_ptr) _old, _val = *_ptr;                       \
+                                                                        \
+                for (;;) {                                              \
+                        _old = cmpxchg(_ptr, _val, _val | _mask);       \
+                        if (_old == _val)                               \
+                                break;                                  \
+                        _val = _old;                                    \
+                }                                                       \
+        _old;                                                           \
+})
+
 #if defined(CONFIG_SMP) && defined(TIF_POLLING_NRFLAG)
 /*
  * Atomically set TIF_NEED_RESCHED and test for TIF_POLLING_NRFLAG,