diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-26 22:56:03 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-26 22:56:03 +1000 |
commit | baddc87d6824cda18037881352fe97382fdb0867 (patch) | |
tree | 7f10a8c28df8136841cae359ded4c321cb1a81ad /arch/powerpc/include/asm/book3s/32/kup.h | |
parent | bb5f33c069402035a3d6a2091ee68cac6999d774 (diff) | |
parent | 595d153dd1022392083ac93a1550382cbee127e0 (diff) |
Merge branch 'fixes' into next
Merge our fixes branch from this cycle. It contains several important
fixes we need in next for testing purposes, and also some that will
conflict with upcoming changes.
Diffstat (limited to 'arch/powerpc/include/asm/book3s/32/kup.h')
-rw-r--r-- | arch/powerpc/include/asm/book3s/32/kup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h index 1617e73bee30..5a267b7e4971 100644 --- a/arch/powerpc/include/asm/book3s/32/kup.h +++ b/arch/powerpc/include/asm/book3s/32/kup.h @@ -75,7 +75,7 @@ .macro kuap_check current, gpr #ifdef CONFIG_PPC_KUAP_DEBUG - lwz \gpr2, KUAP(thread) + lwz \gpr, KUAP(thread) 999: twnei \gpr, 0 EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE) #endif |