diff options
| author | Bharat Nihalani <bnihalani@nvidia.com> | 2013-12-19 23:29:52 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@nvidia.com> | 2013-12-19 23:29:52 -0800 |
| commit | 2b2f508eeb26fd48e6c56b8bd59aa7ad1abf5fd3 (patch) | |
| tree | 07326c802b07a0477a0d48a1be6d0dfc34507a54 /arch/avr32/kernel/entry-avr32b.S | |
| parent | 3321cd648c8ac7af09d52e200ab7816024cfc06d (diff) | |
| parent | 4186e42658f8f3e95fa4f87f917872e8a3431057 (diff) | |
Merge "Merge tag 'v3.10.24' into HEAD" into dev-kernel-3.10
Diffstat (limited to 'arch/avr32/kernel/entry-avr32b.S')
| -rw-r--r-- | arch/avr32/kernel/entry-avr32b.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/avr32/kernel/entry-avr32b.S b/arch/avr32/kernel/entry-avr32b.S index 9899d3cc6f03..7301f4806bbe 100644 --- a/arch/avr32/kernel/entry-avr32b.S +++ b/arch/avr32/kernel/entry-avr32b.S @@ -401,9 +401,10 @@ handle_critical: /* We should never get here... */ bad_return: sub r12, pc, (. - 1f) - bral panic + lddpc pc, 2f .align 2 1: .asciz "Return from critical exception!" +2: .long panic .align 1 do_bus_error_write: |