diff options
author | Michael Neuling <mikey@neuling.org> | 2013-01-10 09:25:34 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-15 13:25:47 -0500 |
commit | b9818c3312da66f4b83a4a2e8650628be1237cb5 (patch) | |
tree | 3facf032be97c0373ba03ee9bce55bb2955d1f55 /arch/powerpc/kernel/hw_breakpoint.c | |
parent | fa5924640341f714af7757194d5da7ecd66abe2b (diff) |
powerpc: Rename set_break to avoid naming conflict
With allmodconfig we are getting:
drivers/tty/synclink_gt.c:160:12: error: conflicting types for 'set_break'
arch/powerpc/include/asm/debug.h:49:5: note: previous declaration of 'set_break' was here
drivers/tty/synclinkmp.c:526:12: error: conflicting types for 'set_break'
arch/powerpc/include/asm/debug.h:49:5: note: previous declaration of 'set_break' was here
This renames set_break to set_breakpoint to avoid this naming conflict
Signed-off-by: Michael Neuling <mikey@neuling.org>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/hw_breakpoint.c')
-rw-r--r-- | arch/powerpc/kernel/hw_breakpoint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c index c7483d09fdd0..2a3e8dd547ec 100644 --- a/arch/powerpc/kernel/hw_breakpoint.c +++ b/arch/powerpc/kernel/hw_breakpoint.c | |||
@@ -73,7 +73,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp) | |||
73 | * If so, DABR will be populated in single_step_dabr_instruction(). | 73 | * If so, DABR will be populated in single_step_dabr_instruction(). |
74 | */ | 74 | */ |
75 | if (current->thread.last_hit_ubp != bp) | 75 | if (current->thread.last_hit_ubp != bp) |
76 | set_break(info); | 76 | set_breakpoint(info); |
77 | 77 | ||
78 | return 0; | 78 | return 0; |
79 | } | 79 | } |
@@ -191,7 +191,7 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs) | |||
191 | 191 | ||
192 | info = counter_arch_bp(tsk->thread.last_hit_ubp); | 192 | info = counter_arch_bp(tsk->thread.last_hit_ubp); |
193 | regs->msr &= ~MSR_SE; | 193 | regs->msr &= ~MSR_SE; |
194 | set_break(info); | 194 | set_breakpoint(info); |
195 | tsk->thread.last_hit_ubp = NULL; | 195 | tsk->thread.last_hit_ubp = NULL; |
196 | } | 196 | } |
197 | 197 | ||
@@ -276,7 +276,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args) | |||
276 | if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ)) | 276 | if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ)) |
277 | perf_bp_event(bp, regs); | 277 | perf_bp_event(bp, regs); |
278 | 278 | ||
279 | set_break(info); | 279 | set_breakpoint(info); |
280 | out: | 280 | out: |
281 | rcu_read_unlock(); | 281 | rcu_read_unlock(); |
282 | return rc; | 282 | return rc; |
@@ -308,7 +308,7 @@ int __kprobes single_step_dabr_instruction(struct die_args *args) | |||
308 | if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ)) | 308 | if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ)) |
309 | perf_bp_event(bp, regs); | 309 | perf_bp_event(bp, regs); |
310 | 310 | ||
311 | set_break(info); | 311 | set_breakpoint(info); |
312 | current->thread.last_hit_ubp = NULL; | 312 | current->thread.last_hit_ubp = NULL; |
313 | 313 | ||
314 | /* | 314 | /* |