1 files changed, 8 insertions, 1 deletions

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 328bca609b9b..45894a469a03 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -123,7 +123,7 @@ extern int _cond_resched(void);
 # define might_resched() do { } while (0)
 #endif
 
-#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+#if defined(CONFIG_DEBUG_SPINLOCK_SLEEP) || defined(CONFIG_DEBUG_PREEMPT)
   void __might_sleep(char *file, int line, int preempt_offset);
 /**
  * might_sleep - annotation for functions that can sleep
@@ -286,6 +286,12 @@ extern void printk_tick(void);
 extern void asmlinkage __attribute__((format(printf, 1, 2)))
         early_printk(const char *fmt, ...);
 
+#ifdef CONFIG_PREEMPT_RT
+extern void zap_rt_locks(void);
+#else
+# define zap_rt_locks() do { } while (0)
+#endif
+
 unsigned long int_sqrt(unsigned long);
 
 static inline void console_silent(void)
@@ -315,6 +321,7 @@ extern int root_mountflags;
 /* Values used for system_state */
 extern enum system_states {
         SYSTEM_BOOTING,
+        SYSTEM_BOOTING_SCHEDULER_OK,
         SYSTEM_RUNNING,
         SYSTEM_HALT,
         SYSTEM_POWER_OFF,