1 files changed, 14 insertions, 7 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d6320a3e8def..d3cd23f30039 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -125,7 +125,7 @@ extern int _cond_resched(void);
 #endif
 #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-  void __might_sleep(char *file, int line);
+  void __might_sleep(char *file, int line, int preempt_offset);
 /**
 * might_sleep - annotation for functions that can sleep
 *
@@ -137,15 +137,16 @@ extern int _cond_resched(void);
 * supposed to.
 */
 # define might_sleep() \
-        do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0)
+        do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
 #else
+  static inline void __might_sleep(char *file, int line, int preempt_offset) { }
 # define might_sleep() do { might_resched(); } while (0)
 #endif
 #define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0)
 #define abs(x) ({                               \
-                int __x = (x);                  \
+                long __x = (x);                 \
                (__x < 0) ? -__x : __x;         \
        })
@@ -245,14 +246,16 @@ extern int printk_ratelimit(void);
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
                                   unsigned int interval_msec);
+extern int printk_delay_msec;
 /*
 * Print a one-time message (analogous to WARN_ONCE() et al):
 */
 #define printk_once(x...) ({                    \
-        static int __print_once = 1;            \
+        static bool __print_once = true;        \
                                                \
        if (__print_once) {                     \
-                __print_once = 0;               \
+                __print_once = false;           \
                printk(x);                      \
        }                                       \
 })
@@ -675,13 +678,17 @@ struct sysinfo {
 };
 /* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#define BUILD_BUG_ON(condition) ((void)BUILD_BUG_ON_ZERO(condition))
+/* Force a compilation error if condition is constant and true */
+#define MAYBE_BUILD_BUG_ON(cond) ((void)sizeof(char[1 - 2 * !!(cond)]))
 /* Force a compilation error if condition is true, but also produce a
   result (of value 0 and type size_t), so the expression can be used
   e.g. in a structure initializer (or where-ever else comma expressions
   aren't permitted). */
-#define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1)
+#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
+#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
 /* Trap pasters of __FUNCTION__ at compile-time */
 #define __FUNCTION__ (__func__)