|
@@ -87,13 +87,13 @@ static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)
|
|
|
|
|
|
static void __kprobes restore_previous_kprobe(struct kprobe_ctlblk *kcb)
|
|
|
{
|
|
|
- __get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp;
|
|
|
+ __this_cpu_write(current_kprobe, kcb->prev_kprobe.kp);
|
|
|
kcb->kprobe_status = kcb->prev_kprobe.status;
|
|
|
}
|
|
|
|
|
|
static inline void __kprobes set_current_kprobe(struct kprobe *p)
|
|
|
{
|
|
|
- __get_cpu_var(current_kprobe) = p;
|
|
|
+ __this_cpu_write(current_kprobe, p);
|
|
|
}
|
|
|
|
|
|
static void __kprobes resume_execution(struct kprobe *p, unsigned long addr,
|
|
@@ -237,7 +237,7 @@ int __kprobes arc_kprobe_handler(unsigned long addr, struct pt_regs *regs)
|
|
|
|
|
|
return 1;
|
|
|
} else if (kprobe_running()) {
|
|
|
- p = __get_cpu_var(current_kprobe);
|
|
|
+ p = __this_cpu_read(current_kprobe);
|
|
|
if (p->break_handler && p->break_handler(p, regs)) {
|
|
|
setup_singlestep(p, regs);
|
|
|
kcb->kprobe_status = KPROBE_HIT_SS;
|