From 906be65fb7b4b5039bc449c8117a7bb43d2dc807 Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Wed, 5 Sep 2012 19:17:48 +0000 Subject: [PATCH] --- yaml --- r: 330273 b: refs/heads/master c: 3f4693eeeae45e9253031633adb0c7fde13a5026 h: refs/heads/master i: 330271: fa2fecdea78f480b706f88f1a14ec56fb7a871be v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/hw_breakpoint.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8f5b51526774..cc59a7916b73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab046a937629172d5da2bbf4867d89507280759f +refs/heads/master: 3f4693eeeae45e9253031633adb0c7fde13a5026 diff --git a/trunk/arch/powerpc/kernel/hw_breakpoint.c b/trunk/arch/powerpc/kernel/hw_breakpoint.c index 956a4c496de9..6767445ecb45 100644 --- a/trunk/arch/powerpc/kernel/hw_breakpoint.c +++ b/trunk/arch/powerpc/kernel/hw_breakpoint.c @@ -294,7 +294,7 @@ int __kprobes single_step_dabr_instruction(struct die_args *args) { struct pt_regs *regs = args->regs; struct perf_event *bp = NULL; - struct arch_hw_breakpoint *bp_info; + struct arch_hw_breakpoint *info; bp = current->thread.last_hit_ubp; /* @@ -304,16 +304,16 @@ int __kprobes single_step_dabr_instruction(struct die_args *args) if (!bp) return NOTIFY_DONE; - bp_info = counter_arch_bp(bp); + info = counter_arch_bp(bp); /* * We shall invoke the user-defined callback function in the single * stepping handler to confirm to 'trigger-after-execute' semantics */ - if (!bp_info->extraneous_interrupt) + if (!info->extraneous_interrupt) perf_bp_event(bp, regs); - set_dabr(bp_info->address | bp_info->type | DABR_TRANSLATION); + set_dabr(info->address | info->type | DABR_TRANSLATION); current->thread.last_hit_ubp = NULL; /*