diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
| commit | c3e5127312f97482a6a09c0df602c726675eff5b (patch) | |
| tree | 9082d8201a1daac5ff019ef50322d551711eb250 /arch/arm/kernel/hw_breakpoint.c | |
| parent | 5e537f041bd05cddee0d2a2fb3013ee642064cc6 (diff) | |
| parent | f171dfebbdf1de4b6ca267285739e190f95f84cc (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.11-0-android-0
Diffstat (limited to 'arch/arm/kernel/hw_breakpoint.c')
| -rw-r--r-- | arch/arm/kernel/hw_breakpoint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index 814a52a9dc3..d6a95ef9131 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -1016,10 +1016,10 @@ static int __init arch_hw_breakpoint_init(void) } /* Register debug fault handler. */ - hook_fault_code(2, hw_breakpoint_pending, SIGTRAP, TRAP_HWBKPT, - "watchpoint debug exception"); - hook_ifault_code(2, hw_breakpoint_pending, SIGTRAP, TRAP_HWBKPT, - "breakpoint debug exception"); + hook_fault_code(FAULT_CODE_DEBUG, hw_breakpoint_pending, SIGTRAP, + TRAP_HWBKPT, "watchpoint debug exception"); + hook_ifault_code(FAULT_CODE_DEBUG, hw_breakpoint_pending, SIGTRAP, + TRAP_HWBKPT, "breakpoint debug exception"); /* Register hotplug notifier. */ register_cpu_notifier(&dbg_reset_nb); |