diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
| commit | ff71abad53cdd1856e6a77ef71a09f1df46c9b87 (patch) | |
| tree | 82f61a0765f7ea45fb6bd87a537bb656eb181601 /include/linux/kprobes.h | |
| parent | aaca8c6eac21c9a662d87ff0e83eb176af970213 (diff) | |
| parent | b924047fe07689ed9b7f0a8e14826534caaff8fc (diff) | |
Merge remote branch 'percpu/for-next'
Diffstat (limited to 'include/linux/kprobes.h')
| -rw-r--r-- | include/linux/kprobes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index b78edb58ee66..dd7c12e875bc 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -305,12 +305,12 @@ struct hlist_head * kretprobe_inst_table_head(struct task_struct *tsk); /* kprobe_running() will just return the current_kprobe on this CPU */ static inline struct kprobe *kprobe_running(void) { - return (__get_cpu_var(current_kprobe)); + return (__this_cpu_read(current_kprobe)); } static inline void reset_current_kprobe(void) { - __get_cpu_var(current_kprobe) = NULL; + __this_cpu_write(current_kprobe, NULL); } static inline struct kprobe_ctlblk *get_kprobe_ctlblk(void) |