diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-09 11:25:48 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-09 11:25:48 +1000 |
| commit | 5f07aa7524e98d6f68f2bec54f155ef6012e2c9a (patch) | |
| tree | 393b2db3213e6618ad1338f9b66019b0c05c6f75 /arch/powerpc/kernel/process.c | |
| parent | e467e104bb7482170b79f516d2025e7cfcaaa733 (diff) | |
| parent | d09ec7387184eba9e3030496f0451204090ff610 (diff) | |
| download | kernel_samsung_smdk4412-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.zip kernel_samsung_smdk4412-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.tar.gz kernel_samsung_smdk4412-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.tar.bz2 | |
Merge commit 'paulus-perf/master' into next
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 773424d..1e78453 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -37,6 +37,7 @@ #include <linux/kernel_stat.h> #include <linux/personality.h> #include <linux/random.h> +#include <linux/hw_breakpoint.h> #include <asm/pgtable.h> #include <asm/uaccess.h> @@ -462,8 +463,14 @@ struct task_struct *__switch_to(struct task_struct *prev, #ifdef CONFIG_PPC_ADV_DEBUG_REGS switch_booke_debug_regs(&new->thread); #else +/* + * For PPC_BOOK3S_64, we use the hw-breakpoint interfaces that would + * schedule DABR + */ +#ifndef CONFIG_HAVE_HW_BREAKPOINT if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr)) set_dabr(new->thread.dabr); +#endif /* CONFIG_HAVE_HW_BREAKPOINT */ #endif @@ -642,7 +649,11 @@ void flush_thread(void) { discard_lazy_cpu_state(); +#ifdef CONFIG_HAVE_HW_BREAKPOINTS + flush_ptrace_hw_breakpoint(current); +#else /* CONFIG_HAVE_HW_BREAKPOINTS */ set_debug_reg_defaults(¤t->thread); +#endif /* CONFIG_HAVE_HW_BREAKPOINTS */ } void @@ -660,6 +671,9 @@ void prepare_to_copy(struct task_struct *tsk) flush_altivec_to_thread(current); flush_vsx_to_thread(current); flush_spe_to_thread(current); +#ifdef CONFIG_HAVE_HW_BREAKPOINT + flush_ptrace_hw_breakpoint(tsk); +#endif /* CONFIG_HAVE_HW_BREAKPOINT */ } /* |