diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-28 14:59:50 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-28 14:59:50 +0300 |
| commit | 95dff480bb7b7b5ea534ebf00a18ff57eb897669 (patch) | |
| tree | 4e7444555649b133c663b43190bc9d2bea4e1712 /arch/powerpc/kernel/exceptions-64s.S | |
| parent | c0b346729b5dd3c7d0232f043f5b15947ffc7978 (diff) | |
| parent | 52396500f97c53860164debc7d4f759077853423 (diff) | |
| download | linux-95dff480bb7b7b5ea534ebf00a18ff57eb897669.tar.xz | |
Merge branch 'fixes' into next
Merge our fixes branch from the 4.16 cycle.
There were a number of important fixes merged, in particular some Power9
workarounds that we want in next for testing purposes. There's also been
some conflicting changes in the CPU features code which are best merged
and tested before going upstream.
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 a19fbaa8e873..6bee20c43feb 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -706,7 +706,7 @@ EXC_COMMON_BEGIN(bad_addr_slb) ld r3, PACA_EXSLB+EX_DAR(r13) std r3, _DAR(r1) beq cr6, 2f - li r10, 0x480 /* fix trap number for I-SLB miss */ + li r10, 0x481 /* fix trap number for I-SLB miss */ std r10, _TRAP(r1) 2: bl save_nvgprs addi r3, r1, STACK_FRAME_OVERHEAD |