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

Commit e0780b72 authored by K.Prasad's avatar K.Prasad Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix call to flush_ptrace_hw_breakpoint() 



Fix the error in spelling the config option for hw-breakpoints and fix
the build issue that follows.

Signed-off by: K.Prasad <prasad@linux.vnet.ibm.com>

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 357574c4

arch/powerpc/kernel/process.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -353,6 +353,7 @@ static void switch_booke_debug_regs(struct thread_struct *new_thread) 
			prime_debug_regs(new_thread);

			prime_debug_regs(new_thread);

}

}

#else	/* !CONFIG_PPC_ADV_DEBUG_REGS */

#else	/* !CONFIG_PPC_ADV_DEBUG_REGS */

#ifndef CONFIG_HAVE_HW_BREAKPOINT

static void set_debug_reg_defaults(struct thread_struct *thread)

static void set_debug_reg_defaults(struct thread_struct *thread)

{

{

	if (thread->dabr) {

	if (thread->dabr) {
@@ -360,6 +361,7 @@ static void set_debug_reg_defaults(struct thread_struct *thread) 
		set_dabr(0);

		set_dabr(0);

	}

	}

}

}

#endif /* !CONFIG_HAVE_HW_BREAKPOINT */

#endif	/* CONFIG_PPC_ADV_DEBUG_REGS */

#endif	/* CONFIG_PPC_ADV_DEBUG_REGS */





int set_dabr(unsigned long dabr)

int set_dabr(unsigned long dabr)
@@ -670,11 +672,11 @@ void flush_thread(void) 
{

{

	discard_lazy_cpu_state();

	discard_lazy_cpu_state();





#ifdef CONFIG_HAVE_HW_BREAKPOINTS

#ifdef CONFIG_HAVE_HW_BREAKPOINT

	flush_ptrace_hw_breakpoint(current);

	flush_ptrace_hw_breakpoint(current);

#else /* CONFIG_HAVE_HW_BREAKPOINTS */

#else /* CONFIG_HAVE_HW_BREAKPOINT */

	set_debug_reg_defaults(&current->thread);

	set_debug_reg_defaults(&current->thread);

#endif /* CONFIG_HAVE_HW_BREAKPOINTS */

#endif /* CONFIG_HAVE_HW_BREAKPOINT */

}

}





void

void