[PATCH] Back out the initial work for atomic copy_*_user()

Back out the use of preempt_count to signify atomicity wrt pagefaults.
We won't do it that way - in_atomic() works fine.

diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index b4ff1a7c881c4555158b42744dbbf8aa181a2132..1b227b3c8ccbdfbdabdacd7711b540ae5fd89966 100644 (file)
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -48,9 +48,6 @@ do { \
        preempt_check_resched(); \
 } while (0)
 
-#define inc_preempt_count_non_preempt()        do { } while (0)
-#define dec_preempt_count_non_preempt()        do { } while (0)
-
 #else
 
 #define preempt_disable()              do { } while (0)
@@ -58,13 +55,6 @@ do { \
 #define preempt_enable()               do { } while (0)
 #define preempt_check_resched()                do { } while (0)
 
-/*
- * Sometimes we want to increment the preempt count, but we know that it's
- * already incremented if the kernel is compiled for preemptibility.
- */
-#define inc_preempt_count_non_preempt()        inc_preempt_count()
-#define dec_preempt_count_non_preempt()        dec_preempt_count()
-
 #endif
 
 #endif /* __LINUX_PREEMPT_H */