diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 12:20:31 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 12:20:31 +0100 |
| commit | 0ba86d7edea1f9f2d9497c31200910263e8b4128 (patch) | |
| tree | 387f713e1afdd181e92699dcaa5fa3d45b30c75b /arch/powerpc/kernel/exceptions-64s.S | |
| parent | Merge branch 'work/old-omapfb-removal' (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | linux-0ba86d7edea1f9f2d9497c31200910263e8b4128.tar.xz linux-0ba86d7edea1f9f2d9497c31200910263e8b4128.zip | |
Merge commit 'v3.3-rc6'
Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.
Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c
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 3844ca7c5099..15c5a4f6de01 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -774,8 +774,8 @@ alignment_common: program_check_common: EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) bl .save_nvgprs - addi r3,r1,STACK_FRAME_OVERHEAD DISABLE_INTS + addi r3,r1,STACK_FRAME_OVERHEAD bl .program_check_exception b .ret_from_except |