Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

[linux-2.6-microblaze.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 78b1d1a..4b256de 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -37,6 +37,7 @@
 #include <linux/nmi.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
+#include <linux/cpu.h>
 #include <linux/io.h>
 #include <linux/hardirq.h>
 #include <linux/atomic.h>
@@ -565,7 +566,7 @@ static bool fixup_iopl_exception(struct pt_regs *regs)
  */
 static bool try_fixup_enqcmd_gp(void)
 {
-#ifdef CONFIG_IOMMU_SVA
+#ifdef CONFIG_ARCH_HAS_CPU_PASID
        u32 pasid;
 
        /*
@@ -591,7 +592,7 @@ static bool try_fixup_enqcmd_gp(void)
        if (!mm_valid_pasid(current->mm))
                return false;
 
-       pasid = current->mm->pasid;
+       pasid = mm_get_enqcmd_pasid(current->mm);
 
        /*
         * Did this thread already have its PASID activated?