diff options
Diffstat (limited to 'arch/s390/kernel/kprobes.c')
-rw-r--r-- | arch/s390/kernel/kprobes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 27ae5433fe4d..014d4729b134 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c | |||
@@ -218,9 +218,9 @@ static void __kprobes disable_singlestep(struct kprobe_ctlblk *kcb, | |||
218 | */ | 218 | */ |
219 | static void __kprobes push_kprobe(struct kprobe_ctlblk *kcb, struct kprobe *p) | 219 | static void __kprobes push_kprobe(struct kprobe_ctlblk *kcb, struct kprobe *p) |
220 | { | 220 | { |
221 | kcb->prev_kprobe.kp = __get_cpu_var(current_kprobe); | 221 | kcb->prev_kprobe.kp = __this_cpu_read(current_kprobe); |
222 | kcb->prev_kprobe.status = kcb->kprobe_status; | 222 | kcb->prev_kprobe.status = kcb->kprobe_status; |
223 | __get_cpu_var(current_kprobe) = p; | 223 | __this_cpu_write(current_kprobe, p); |
224 | } | 224 | } |
225 | 225 | ||
226 | /* | 226 | /* |
@@ -230,7 +230,7 @@ static void __kprobes push_kprobe(struct kprobe_ctlblk *kcb, struct kprobe *p) | |||
230 | */ | 230 | */ |
231 | static void __kprobes pop_kprobe(struct kprobe_ctlblk *kcb) | 231 | static void __kprobes pop_kprobe(struct kprobe_ctlblk *kcb) |
232 | { | 232 | { |
233 | __get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp; | 233 | __this_cpu_write(current_kprobe, kcb->prev_kprobe.kp); |
234 | kcb->kprobe_status = kcb->prev_kprobe.status; | 234 | kcb->kprobe_status = kcb->prev_kprobe.status; |
235 | } | 235 | } |
236 | 236 | ||
@@ -311,7 +311,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) | |||
311 | enable_singlestep(kcb, regs, (unsigned long) p->ainsn.insn); | 311 | enable_singlestep(kcb, regs, (unsigned long) p->ainsn.insn); |
312 | return 1; | 312 | return 1; |
313 | } else if (kprobe_running()) { | 313 | } else if (kprobe_running()) { |
314 | p = __get_cpu_var(current_kprobe); | 314 | p = __this_cpu_read(current_kprobe); |
315 | if (p->break_handler && p->break_handler(p, regs)) { | 315 | if (p->break_handler && p->break_handler(p, regs)) { |
316 | /* | 316 | /* |
317 | * Continuation after the jprobe completed and | 317 | * Continuation after the jprobe completed and |