Merge tag 'mm-nonmm-stable-2022-10-11' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / arch / powerpc / kernel / process.c

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 991cda2..40834ef 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -127,7 +127,7 @@ unsigned long notrace msr_check_and_set(unsigned long bits)
                newmsr |= MSR_VSX;
 
        if (oldmsr != newmsr)
-               mtmsr_isync(newmsr);
+               newmsr = mtmsr_isync_irqsafe(newmsr);
 
        return newmsr;
 }
@@ -145,7 +145,7 @@ void notrace __msr_check_and_clear(unsigned long bits)
                newmsr &= ~MSR_VSX;
 
        if (oldmsr != newmsr)
-               mtmsr_isync(newmsr);
+               mtmsr_isync_irqsafe(newmsr);
 }
 EXPORT_SYMBOL(__msr_check_and_clear);