Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michael Neuling and committed by
Benjamin Herrenschmidt
b9818c33 fa592464

+11 -11
+1 -1
arch/powerpc/include/asm/debug.h
··· 46 46 static inline int debugger_fault_handler(struct pt_regs *regs) { return 0; } 47 47 #endif 48 48 49 - int set_break(struct arch_hw_breakpoint *brk); 49 + int set_breakpoint(struct arch_hw_breakpoint *brk); 50 50 #ifdef CONFIG_PPC_ADV_DEBUG_REGS 51 51 extern void do_send_trap(struct pt_regs *regs, unsigned long address, 52 52 unsigned long error_code, int signal_code, int brkpt);
+1 -1
arch/powerpc/include/asm/hw_breakpoint.h
··· 81 81 brk.address = 0; 82 82 brk.type = 0; 83 83 brk.len = 0; 84 - set_break(&brk); 84 + set_breakpoint(&brk); 85 85 } 86 86 extern void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs); 87 87
+4 -4
arch/powerpc/kernel/hw_breakpoint.c
··· 73 73 * If so, DABR will be populated in single_step_dabr_instruction(). 74 74 */ 75 75 if (current->thread.last_hit_ubp != bp) 76 - set_break(info); 76 + set_breakpoint(info); 77 77 78 78 return 0; 79 79 } ··· 191 191 192 192 info = counter_arch_bp(tsk->thread.last_hit_ubp); 193 193 regs->msr &= ~MSR_SE; 194 - set_break(info); 194 + set_breakpoint(info); 195 195 tsk->thread.last_hit_ubp = NULL; 196 196 } 197 197 ··· 276 276 if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ)) 277 277 perf_bp_event(bp, regs); 278 278 279 - set_break(info); 279 + set_breakpoint(info); 280 280 out: 281 281 rcu_read_unlock(); 282 282 return rc; ··· 308 308 if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ)) 309 309 perf_bp_event(bp, regs); 310 310 311 - set_break(info); 311 + set_breakpoint(info); 312 312 current->thread.last_hit_ubp = NULL; 313 313 314 314 /*
+3 -3
arch/powerpc/kernel/process.c
··· 366 366 { 367 367 thread->hw_brk.address = 0; 368 368 thread->hw_brk.type = 0; 369 - set_break(&thread->hw_brk); 369 + set_breakpoint(&thread->hw_brk); 370 370 } 371 371 #endif /* !CONFIG_HAVE_HW_BREAKPOINT */ 372 372 #endif /* CONFIG_PPC_ADV_DEBUG_REGS */ ··· 427 427 return 0; 428 428 } 429 429 430 - int set_break(struct arch_hw_breakpoint *brk) 430 + int set_breakpoint(struct arch_hw_breakpoint *brk) 431 431 { 432 432 __get_cpu_var(current_brk) = *brk; 433 433 ··· 538 538 */ 539 539 #ifndef CONFIG_HAVE_HW_BREAKPOINT 540 540 if (unlikely(hw_brk_match(&__get_cpu_var(current_brk), &new->thread.hw_brk))) 541 - set_break(&new->thread.hw_brk); 541 + set_breakpoint(&new->thread.hw_brk); 542 542 #endif /* CONFIG_HAVE_HW_BREAKPOINT */ 543 543 #endif 544 544
+1 -1
arch/powerpc/kernel/signal.c
··· 132 132 */ 133 133 if (current->thread.hw_brk.address && 134 134 current->thread.hw_brk.type) 135 - set_break(&current->thread.hw_brk); 135 + set_breakpoint(&current->thread.hw_brk); 136 136 #endif 137 137 /* Re-enable the breakpoints for the signal stack */ 138 138 thread_change_pc(current, regs);
+1 -1
arch/powerpc/xmon/xmon.c
··· 747 747 brk.address = dabr.address; 748 748 brk.type = (dabr.enabled & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL; 749 749 brk.len = 8; 750 - set_break(&brk); 750 + set_breakpoint(&brk); 751 751 } 752 752 if (iabr && cpu_has_feature(CPU_FTR_IABR)) 753 753 mtspr(SPRN_IABR, iabr->address