summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/percpu.h4
-rw-r--r--include/linux/smp.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 577df0fbe10d..deac3ced6a2c 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -8,7 +8,9 @@
#else
#define __per_cpu_data
#define per_cpu(var, cpu) var
-#define this_cpu(var) var
+#define __get_cpu_var(var) var
#endif
+#define get_cpu_var(var) ({ preempt_disable(); __get_cpu_var(var); })
+#define put_cpu_var(var) preempt_enable()
#endif /* __LINUX_PERCPU_H */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 9c6edbd8e6ec..6f6c6ed7a239 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -96,9 +96,6 @@ static inline void smp_send_reschedule_all(void) { }
#define cpu_online_map 1
#define cpu_online(cpu) ({ cpu; 1; })
#define num_online_cpus() 1
-#define __per_cpu_data
-#define per_cpu(var, cpu) var
-#define this_cpu(var) var
struct notifier_block;