summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@digeo.com>2002-09-07 22:21:48 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-09-07 22:21:48 -0700
commit9fdbd959bfec877913d4eab793e813cc7d447b3f (patch)
treed27be217693c66bd27b901dfe2b77e3e6693ba85
parent0e64a39da77a2098c3c17586d66cd17ae038493c (diff)
[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.
-rw-r--r--include/linux/preempt.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index b4ff1a7c881c..1b227b3c8ccb 100644
--- 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 */