Merge commit 'v2.6.38-rc6' into for-2.6.39/core

[pandora-kernel.git] / include / linux / elevator.h

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 86120c9..39b68ed 100644 (file)
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -196,15 +196,9 @@ enum {
 /*
  * io context count accounting
  */
-#define elv_ioc_count_mod(name, __val)                         \
-       do {                                                    \
-               preempt_disable();                              \
-               __get_cpu_var(name) += (__val);                 \
-               preempt_enable();                               \
-       } while (0)
-
-#define elv_ioc_count_inc(name)        elv_ioc_count_mod(name, 1)
-#define elv_ioc_count_dec(name)        elv_ioc_count_mod(name, -1)
+#define elv_ioc_count_mod(name, __val) this_cpu_add(name, __val)
+#define elv_ioc_count_inc(name)        this_cpu_inc(name)
+#define elv_ioc_count_dec(name)        this_cpu_dec(name)
 
 #define elv_ioc_count_read(name)                               \
 ({                                                             \