Cset exclude: rml@tech9.net|ChangeSet|20020820192302|03508

include/linux/preempt.h

 #ifndef __LINUX_PREEMPT_H
 #define __LINUX_PREEMPT_H
 
-/*
- * include/linux/preempt.h - macros for accessing and manipulating
- * preempt_count (used for kernel preemption, interrupt count, etc.)
- */
-
 #include <linux/config.h>
 
 #define preempt_count() (current_thread_info()->preempt_count)
@@ -36,16 +31,17 @@ do { \
 	barrier(); \
 } while (0)
 
-#define preempt_check_resched() \
+#define preempt_enable() \
 do { \
+	preempt_enable_no_resched(); \
 	if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) \
 		preempt_schedule(); \
 } while (0)
 
-#define preempt_enable() \
+#define preempt_check_resched() \
 do { \
-	preempt_enable_no_resched(); \
-	preempt_check_resched(); \
+	if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) \
+		preempt_schedule(); \
 } while (0)
 
 #define inc_preempt_count_non_preempt()	do { } while (0)
@@ -54,7 +50,7 @@ do { \
 #else
 
 #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()		do { } while (0)
 #define preempt_check_resched()		do { } while (0)