This is a note to let you know that I've just added the patch titled powerpc/64s: Define MASKABLE_RELON_EXCEPTION_PSERIES_OOL to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: powerpc-64s-define-maskable_relon_exception_pseries_ool.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Fri Nov 20 08:20:38 AM CET 2020 From: Daniel Axtens <dja@xxxxxxxxxx> Date: Fri, 20 Nov 2020 10:52:37 +1100 Subject: powerpc/64s: Define MASKABLE_RELON_EXCEPTION_PSERIES_OOL To: stable@xxxxxxxxxxxxxxx Cc: dja@xxxxxxxxxx Message-ID: <20201119235244.373127-2-dja@xxxxxxxxxx> From: Daniel Axtens <dja@xxxxxxxxxx> Commit da2bc4644c75 ("powerpc/64s: Add new exception vector macros") adds: +#define __TRAMP_REAL_VIRT_OOL_MASKABLE(name, realvec) \ + TRAMP_REAL_BEGIN(tramp_virt_##name); \ + MASKABLE_RELON_EXCEPTION_PSERIES_OOL(realvec, name##_common); \ However there's no reference there or anywhere else to MASKABLE_RELON_EXCEPTION_PSERIES_OOL and an attempt to use it unsurprisingly doesn't work. Add a definition provided by mpe. Fixes: da2bc4644c75 ("powerpc/64s: Add new exception vector macros") Signed-off-by: Daniel Axtens <dja@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/powerpc/include/asm/exception-64s.h | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h @@ -645,6 +645,10 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec); \ EXCEPTION_RELON_PROLOG_PSERIES_1(label, EXC_HV) +#define MASKABLE_RELON_EXCEPTION_PSERIES_OOL(vec, label) \ + EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_NOTEST_PR, vec); \ + EXCEPTION_PROLOG_PSERIES_1(label, EXC_STD) + /* * Our exception common code can be passed various "additions" * to specify the behaviour of interrupts, whether to kick the Patches currently in stable-queue which might be from dja@xxxxxxxxxx are queue-4.14/powerpc-add-a-framework-for-user-access-tracking.patch queue-4.14/powerpc-implement-user_access_begin-and-friends.patch queue-4.14/powerpc-uaccess-evaluate-macro-arguments-once-before-user-access-is-allowed.patch queue-4.14/powerpc-64s-flush-l1d-after-user-accesses.patch queue-4.14/powerpc-64s-move-some-exception-handlers-out-of-line.patch queue-4.14/powerpc-64s-flush-l1d-on-kernel-entry.patch queue-4.14/powerpc-fix-__clear_user-with-kuap-enabled.patch queue-4.14/powerpc-64s-define-maskable_relon_exception_pseries_ool.patch