diff options
Diffstat (limited to 'arch/x86/kernel/kprobes.c')
| -rw-r--r-- | arch/x86/kernel/kprobes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 5b8c7505b3bc..04bc8c9c43f9 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c | |||
| @@ -434,7 +434,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs, | |||
| 434 | /* Boost up -- we can execute copied instructions directly */ | 434 | /* Boost up -- we can execute copied instructions directly */ |
| 435 | reset_current_kprobe(); | 435 | reset_current_kprobe(); |
| 436 | regs->ip = (unsigned long)p->ainsn.insn; | 436 | regs->ip = (unsigned long)p->ainsn.insn; |
| 437 | preempt_enable_no_resched(); | 437 | preempt_enable(); |
| 438 | return; | 438 | return; |
| 439 | } | 439 | } |
| 440 | #endif | 440 | #endif |
| @@ -543,7 +543,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) | |||
| 543 | } | 543 | } |
| 544 | } /* else: not a kprobe fault; let the kernel handle it */ | 544 | } /* else: not a kprobe fault; let the kernel handle it */ |
| 545 | 545 | ||
| 546 | preempt_enable_no_resched(); | 546 | preempt_enable(); |
| 547 | return 0; | 547 | return 0; |
| 548 | } | 548 | } |
| 549 | 549 | ||
| @@ -843,7 +843,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) | |||
| 843 | } | 843 | } |
| 844 | reset_current_kprobe(); | 844 | reset_current_kprobe(); |
| 845 | out: | 845 | out: |
| 846 | preempt_enable_no_resched(); | 846 | preempt_enable(); |
| 847 | 847 | ||
| 848 | /* | 848 | /* |
| 849 | * if somebody else is singlestepping across a probe point, flags | 849 | * if somebody else is singlestepping across a probe point, flags |
| @@ -877,7 +877,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) | |||
| 877 | restore_previous_kprobe(kcb); | 877 | restore_previous_kprobe(kcb); |
| 878 | else | 878 | else |
| 879 | reset_current_kprobe(); | 879 | reset_current_kprobe(); |
| 880 | preempt_enable_no_resched(); | 880 | preempt_enable(); |
| 881 | break; | 881 | break; |
| 882 | case KPROBE_HIT_ACTIVE: | 882 | case KPROBE_HIT_ACTIVE: |
| 883 | case KPROBE_HIT_SSDONE: | 883 | case KPROBE_HIT_SSDONE: |
| @@ -1024,7 +1024,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) | |||
| 1024 | memcpy((kprobe_opcode_t *)(kcb->jprobe_saved_sp), | 1024 | memcpy((kprobe_opcode_t *)(kcb->jprobe_saved_sp), |
| 1025 | kcb->jprobes_stack, | 1025 | kcb->jprobes_stack, |
| 1026 | MIN_STACK_SIZE(kcb->jprobe_saved_sp)); | 1026 | MIN_STACK_SIZE(kcb->jprobe_saved_sp)); |
| 1027 | preempt_enable_no_resched(); | 1027 | preempt_enable(); |
| 1028 | return 1; | 1028 | return 1; |
| 1029 | } | 1029 | } |
| 1030 | return 0; | 1030 | return 0; |
