aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kprobes.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index f66b8e681b4d..41dfda50e22a 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -347,17 +347,17 @@ struct hlist_head __kprobes *kretprobe_inst_table_head(struct task_struct *tsk)
347 */ 347 */
348void __kprobes kprobe_flush_task(struct task_struct *tk) 348void __kprobes kprobe_flush_task(struct task_struct *tk)
349{ 349{
350 struct kretprobe_instance *ri; 350 struct kretprobe_instance *ri;
351 struct hlist_head *head; 351 struct hlist_head *head;
352 struct hlist_node *node, *tmp; 352 struct hlist_node *node, *tmp;
353 unsigned long flags = 0; 353 unsigned long flags = 0;
354 354
355 spin_lock_irqsave(&kretprobe_lock, flags); 355 spin_lock_irqsave(&kretprobe_lock, flags);
356 head = kretprobe_inst_table_head(tk); 356 head = kretprobe_inst_table_head(tk);
357 hlist_for_each_entry_safe(ri, node, tmp, head, hlist) { 357 hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
358 if (ri->task == tk) 358 if (ri->task == tk)
359 recycle_rp_inst(ri); 359 recycle_rp_inst(ri);
360 } 360 }
361 spin_unlock_irqrestore(&kretprobe_lock, flags); 361 spin_unlock_irqrestore(&kretprobe_lock, flags);
362} 362}
363 363
@@ -514,7 +514,7 @@ static int __kprobes __register_kprobe(struct kprobe *p,
514 (ARCH_INACTIVE_KPROBE_COUNT + 1)) 514 (ARCH_INACTIVE_KPROBE_COUNT + 1))
515 register_page_fault_notifier(&kprobe_page_fault_nb); 515 register_page_fault_notifier(&kprobe_page_fault_nb);
516 516
517 arch_arm_kprobe(p); 517 arch_arm_kprobe(p);
518 518
519out: 519out:
520 mutex_unlock(&kprobe_mutex); 520 mutex_unlock(&kprobe_mutex);