Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9818c33 authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

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: default avatarMichael Neuling <mikey@neuling.org>
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fa592464

arch/powerpc/include/asm/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline int debugger_break_match(struct pt_regs *regs) { return 0; } 
static inline int debugger_fault_handler(struct pt_regs *regs) { return 0; }

#endif



int set_break(struct arch_hw_breakpoint *brk);

int set_breakpoint(struct arch_hw_breakpoint *brk);

#ifdef CONFIG_PPC_ADV_DEBUG_REGS

extern void do_send_trap(struct pt_regs *regs, unsigned long address,

			 unsigned long error_code, int signal_code, int brkpt);

arch/powerpc/include/asm/hw_breakpoint.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static inline void hw_breakpoint_disable(void) 
	brk.address = 0;

	brk.type = 0;

	brk.len = 0;

	set_break(&brk);

	set_breakpoint(&brk);

}

extern void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs);

arch/powerpc/kernel/hw_breakpoint.c

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp) 
	 * If so, DABR will be populated in single_step_dabr_instruction().

	 */

	if (current->thread.last_hit_ubp != bp)

		set_break(info);

		set_breakpoint(info);



	return 0;

}
@@ -191,7 +191,7 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs) 


	info = counter_arch_bp(tsk->thread.last_hit_ubp);

	regs->msr &= ~MSR_SE;

	set_break(info);

	set_breakpoint(info);

	tsk->thread.last_hit_ubp = NULL;

}
@@ -276,7 +276,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args) 
	if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))

		perf_bp_event(bp, regs);



	set_break(info);

	set_breakpoint(info);

out:

	rcu_read_unlock();

	return rc;
@@ -308,7 +308,7 @@ int __kprobes single_step_dabr_instruction(struct die_args *args) 
	if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))

		perf_bp_event(bp, regs);



	set_break(info);

	set_breakpoint(info);

	current->thread.last_hit_ubp = NULL;



	/*

arch/powerpc/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static void set_debug_reg_defaults(struct thread_struct *thread) 
{

	thread->hw_brk.address = 0;

	thread->hw_brk.type = 0;

	set_break(&thread->hw_brk);

	set_breakpoint(&thread->hw_brk);

}

#endif /* !CONFIG_HAVE_HW_BREAKPOINT */

#endif	/* CONFIG_PPC_ADV_DEBUG_REGS */
@@ -427,7 +427,7 @@ static inline int set_dawr(struct arch_hw_breakpoint *brk) 
	return 0;

}



int set_break(struct arch_hw_breakpoint *brk)

int set_breakpoint(struct arch_hw_breakpoint *brk)

{

	__get_cpu_var(current_brk) = *brk;
@@ -538,7 +538,7 @@ struct task_struct *__switch_to(struct task_struct *prev, 
 */

#ifndef CONFIG_HAVE_HW_BREAKPOINT

	if (unlikely(hw_brk_match(&__get_cpu_var(current_brk), &new->thread.hw_brk)))

		set_break(&new->thread.hw_brk);

		set_breakpoint(&new->thread.hw_brk);

#endif /* CONFIG_HAVE_HW_BREAKPOINT */

#endif

arch/powerpc/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int do_signal(struct pt_regs *regs) 
	 */

	if (current->thread.hw_brk.address &&

		current->thread.hw_brk.type)

		set_break(&current->thread.hw_brk);

		set_breakpoint(&current->thread.hw_brk);

#endif

	/* Re-enable the breakpoints for the signal stack */

	thread_change_pc(current, regs);