diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:18 -0500 |
| commit | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (patch) | |
| tree | ab89c74c09c2986fa01c25ad8e45989a48a18899 /arch/powerpc/kernel/exceptions-64s.S | |
| parent | 7dae8c5209147ad06d424928a5f1ec45caa87691 (diff) | |
| parent | 678a0222edc9da43a22145d68647500ee85e6c04 (diff) | |
Merge branch 'lpc32xx/drivers' into next/drivers
* lpc32xx/drivers: (566 commits)
ARM: LPC32xx: ADC support for mach-lpc32xx
Includes an update to Linux 3.3-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index d4be7bb3dbdf..3844ca7c5099 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
| @@ -775,7 +775,7 @@ program_check_common: | |||
| 775 | EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) | 775 | EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) |
| 776 | bl .save_nvgprs | 776 | bl .save_nvgprs |
| 777 | addi r3,r1,STACK_FRAME_OVERHEAD | 777 | addi r3,r1,STACK_FRAME_OVERHEAD |
| 778 | ENABLE_INTS | 778 | DISABLE_INTS |
| 779 | bl .program_check_exception | 779 | bl .program_check_exception |
| 780 | b .ret_from_except | 780 | b .ret_from_except |
| 781 | 781 | ||