Merge branch 'linus' into x86/asm

Sync up the latest NMI fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

14 files changed, 174 insertions, 61 deletions

diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h
index 62ce6823c0f2..9a62937c56ca 100644
--- a/include/asm-generic/cputime.h
+++ b/include/asm-generic/cputime.h
@@ -4,70 +4,66 @@
 #include <linux/time.h>
 #include <linux/jiffies.h>
 
-typedef unsigned long cputime_t;
+typedef unsigned long __nocast cputime_t;
 
-#define cputime_zero                    (0UL)
 #define cputime_one_jiffy               jiffies_to_cputime(1)
-#define cputime_max                     ((~0UL >> 1) - 1)
-#define cputime_add(__a, __b)           ((__a) +  (__b))
-#define cputime_sub(__a, __b)           ((__a) -  (__b))
-#define cputime_div(__a, __n)           ((__a) /  (__n))
-#define cputime_halve(__a)              ((__a) >> 1)
-#define cputime_eq(__a, __b)            ((__a) == (__b))
-#define cputime_gt(__a, __b)            ((__a) >  (__b))
-#define cputime_ge(__a, __b)            ((__a) >= (__b))
-#define cputime_lt(__a, __b)            ((__a) <  (__b))
-#define cputime_le(__a, __b)            ((__a) <= (__b))
-#define cputime_to_jiffies(__ct)        (__ct)
+#define cputime_to_jiffies(__ct)        (__force unsigned long)(__ct)
 #define cputime_to_scaled(__ct)         (__ct)
-#define jiffies_to_cputime(__hz)        (__hz)
+#define jiffies_to_cputime(__hz)        (__force cputime_t)(__hz)
 
-typedef u64 cputime64_t;
+typedef u64 __nocast cputime64_t;
 
-#define cputime64_zero (0ULL)
-#define cputime64_add(__a, __b)         ((__a) + (__b))
-#define cputime64_sub(__a, __b)         ((__a) - (__b))
-#define cputime64_to_jiffies64(__ct)    (__ct)
-#define jiffies64_to_cputime64(__jif)   (__jif)
-#define cputime_to_cputime64(__ct)      ((u64) __ct)
-#define cputime64_gt(__a, __b)          ((__a) >  (__b))
+#define cputime64_to_jiffies64(__ct)    (__force u64)(__ct)
+#define jiffies64_to_cputime64(__jif)   (__force cputime64_t)(__jif)
 
-#define nsecs_to_cputime64(__ct)        nsecs_to_jiffies64(__ct)
+#define nsecs_to_cputime64(__ct)        \
+        jiffies64_to_cputime64(nsecs_to_jiffies64(__ct))
 
 
 /*
  * Convert cputime to microseconds and back.
  */
-#define cputime_to_usecs(__ct)          jiffies_to_usecs(__ct)
-#define usecs_to_cputime(__msecs)       usecs_to_jiffies(__msecs)
+#define cputime_to_usecs(__ct)          \
+        jiffies_to_usecs(cputime_to_jiffies(__ct))
+#define usecs_to_cputime(__usec)        \
+        jiffies_to_cputime(usecs_to_jiffies(__usec))
+#define usecs_to_cputime64(__usec)      \
+        jiffies64_to_cputime64(nsecs_to_jiffies64((__usec) * 1000))
 
 /*
  * Convert cputime to seconds and back.
  */
-#define cputime_to_secs(jif)            ((jif) / HZ)
-#define secs_to_cputime(sec)            ((sec) * HZ)
+#define cputime_to_secs(jif)            (cputime_to_jiffies(jif) / HZ)
+#define secs_to_cputime(sec)            jiffies_to_cputime((sec) * HZ)
 
 /*
  * Convert cputime to timespec and back.
  */
-#define timespec_to_cputime(__val)      timespec_to_jiffies(__val)
-#define cputime_to_timespec(__ct,__val) jiffies_to_timespec(__ct,__val)
+#define timespec_to_cputime(__val)      \
+        jiffies_to_cputime(timespec_to_jiffies(__val))
+#define cputime_to_timespec(__ct,__val) \
+        jiffies_to_timespec(cputime_to_jiffies(__ct),__val)
 
 /*
  * Convert cputime to timeval and back.
  */
-#define timeval_to_cputime(__val)       timeval_to_jiffies(__val)
-#define cputime_to_timeval(__ct,__val)  jiffies_to_timeval(__ct,__val)
+#define timeval_to_cputime(__val)       \
+        jiffies_to_cputime(timeval_to_jiffies(__val))
+#define cputime_to_timeval(__ct,__val)  \
+        jiffies_to_timeval(cputime_to_jiffies(__ct),__val)
 
 /*
  * Convert cputime to clock and back.
  */
-#define cputime_to_clock_t(__ct)        jiffies_to_clock_t(__ct)
-#define clock_t_to_cputime(__x)         clock_t_to_jiffies(__x)
+#define cputime_to_clock_t(__ct)        \
+        jiffies_to_clock_t(cputime_to_jiffies(__ct))
+#define clock_t_to_cputime(__x)         \
+        jiffies_to_cputime(clock_t_to_jiffies(__x))
 
 /*
  * Convert cputime64 to clock.
  */
-#define cputime64_to_clock_t(__ct)      jiffies_64_to_clock_t(__ct)
+#define cputime64_to_clock_t(__ct)      \
+        jiffies_64_to_clock_t(cputime64_to_jiffies64(__ct))
 
 #endif
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 8c8621097fa0..1ff4e221cb4d 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -4,6 +4,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/errno.h>
+#include <linux/of.h>
 
 #ifdef CONFIG_GPIOLIB
 
@@ -128,13 +129,14 @@ struct gpio_chip {
          */
         struct device_node *of_node;
         int of_gpio_n_cells;
-        int (*of_xlate)(struct gpio_chip *gc, struct device_node *np,
-                        const void *gpio_spec, u32 *flags);
+        int (*of_xlate)(struct gpio_chip *gc,
+                        const struct of_phandle_args *gpiospec, u32 *flags);
 #endif
 };
 
 extern const char *gpiochip_is_requested(struct gpio_chip *chip,
                         unsigned offset);
+extern struct gpio_chip *gpio_to_chip(unsigned gpio);
 extern int __must_check gpiochip_reserve(int start, int ngpio);
 
 /* add/remove chips */
@@ -175,6 +177,10 @@ extern int gpio_request_one(unsigned gpio, unsigned long flags, const char *labe
 extern int gpio_request_array(const struct gpio *array, size_t num);
 extern void gpio_free_array(const struct gpio *array, size_t num);
 
+/* bindings for managed devices that want to request gpios */
+int devm_gpio_request(struct device *dev, unsigned gpio, const char *label);
+void devm_gpio_free(struct device *dev, unsigned int gpio);
+
 #ifdef CONFIG_GPIO_SYSFS
 
 /*
diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h
new file mode 100644
index 000000000000..a6806a94250d
--- /dev/null
+++ b/include/asm-generic/io-64-nonatomic-hi-lo.h
@@ -0,0 +1,28 @@
+#ifndef _ASM_IO_64_NONATOMIC_HI_LO_H_
+#define _ASM_IO_64_NONATOMIC_HI_LO_H_
+
+#include <linux/io.h>
+#include <asm-generic/int-ll64.h>
+