1 files changed, 28 insertions, 2 deletions

diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 2e681d9555bd..9dfe0eb1b47a 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -33,12 +33,24 @@ do { \
         barrier(); \
 } while (0)
 
-#define preempt_enable_no_resched() \
+#define __preempt_enable_no_resched() \
 do { \
         barrier(); \
         dec_preempt_count(); \
 } while (0)
 
+#ifdef CONFIG_DEBUG_PREEMPT
+extern void notrace preempt_enable_no_resched(void);
+#else
+# define preempt_enable_no_resched() __preempt_enable_no_resched()
+#endif
+
+#define preempt_enable_and_schedule() \
+do { \
+        __preempt_enable_no_resched(); \
+        schedule(); \
+} while (0)
+
 #define preempt_check_resched() \
 do { \
         if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) \
@@ -47,7 +59,7 @@ do { \
 
 #define preempt_enable() \
 do { \
-        preempt_enable_no_resched(); \
+        __preempt_enable_no_resched(); \
         barrier(); \
         preempt_check_resched(); \
 } while (0)
@@ -84,6 +96,8 @@ do { \
 
 #define preempt_disable()               do { } while (0)
 #define preempt_enable_no_resched()     do { } while (0)
+#define __preempt_enable_no_resched()   do { } while (0)
+#define preempt_enable_and_schedule()   schedule()
 #define preempt_enable()                do { } while (0)
 #define preempt_check_resched()         do { } while (0)
 
@@ -93,6 +107,18 @@ do { \
 
 #endif
 
+#ifdef CONFIG_PREEMPT_RT
+# define preempt_disable_rt()           preempt_disable()
+# define preempt_enable_rt()            preempt_enable()
+# define preempt_disable_nort()         do { } while (0)
+# define preempt_enable_nort()          do { } while (0)
+#else
+# define preempt_disable_rt()           do { } while (0)
+# define preempt_enable_rt()            do { } while (0)
+# define preempt_disable_nort()         preempt_disable()
+# define preempt_enable_nort()          preempt_enable()
+#endif
+
 #ifdef CONFIG_PREEMPT_NOTIFIERS
 
 struct preempt_notifier;