Index: arch/amd64/include/atomic.h
===================================================================
--- arch/amd64/include/atomic.h	(revision 8e0eb6329d476f643af8adc7546d4f1d1b8d77e3)
+++ arch/amd64/include/atomic.h	(revision 8dfef11fc8d83f91532e1905a1f846c9a6fb4da9)
@@ -60,5 +60,5 @@
 }
 
-static inline count_t atomic_inc_pre(atomic_t *val) 
+static inline count_t atomic_postinc(atomic_t *val) 
 {
 	count_t r;
@@ -73,5 +73,5 @@
 }
 
-static inline count_t atomic_dec_pre(atomic_t *val) 
+static inline count_t atomic_postdec(atomic_t *val) 
 {
 	count_t r;
@@ -86,6 +86,6 @@
 }
 
-#define atomic_inc_post(val) (atomic_inc_pre(val)+1)
-#define atomic_dec_post(val) (atomic_dec_pre(val)-1)
+#define atomic_preinc(val) (atomic_postinc(val)+1)
+#define atomic_predec(val) (atomic_postdec(val)-1)
 
 static inline __u64 test_and_set(atomic_t *val) {