| Message ID | 20191022060603.24101-1-ajd@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1db550f44ab672b5ded14a94e092b9a9a2d29c8c |
| Headers | show |
| Series | powerpc/64s/exception: Fix kaup -> kuap typo | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (6b450d0404ca83dc131dadffd40c5aa6f7a603af) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | fail | Test checkpatch on branch powerpc/merge |
On Tue, 2019-10-22 at 17:06 +1100, Andrew Donnellan wrote: > It's KUAP, not KAUP. Fix typo in INT_COMMON macro. > > Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> Akced-by: Russell Currey <ruscur@russell.cc>
On Tue, 2019-10-22 at 06:06:03 UTC, Andrew Donnellan wrote: > It's KUAP, not KAUP. Fix typo in INT_COMMON macro. > > Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/1db550f44ab672b5ded14a94e092b9a9a2d29c8c cheers
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index d0018dd17e0a..46508b148e16 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -514,7 +514,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948) * If stack=0, then the stack is already set in r1, and r1 is saved in r10. * PPR save and CPU accounting is not done for the !stack case (XXX why not?) */ -.macro INT_COMMON vec, area, stack, kaup, reconcile, dar, dsisr +.macro INT_COMMON vec, area, stack, kuap, reconcile, dar, dsisr .if \stack andi. r10,r12,MSR_PR /* See if coming from user */ mr r10,r1 /* Save r1 */ @@ -533,7 +533,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948) std r10,GPR1(r1) /* save r1 in stackframe */ .if \stack - .if \kaup + .if \kuap kuap_save_amr_and_lock r9, r10, cr1, cr0 .endif beq 101f /* if from kernel mode */ @@ -541,7 +541,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948) SAVE_PPR(\area, r9) 101: .else - .if \kaup + .if \kuap kuap_save_amr_and_lock r9, r10, cr1 .endif .endif
It's KUAP, not KAUP. Fix typo in INT_COMMON macro. Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com> --- arch/powerpc/kernel/exceptions-64s.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)