X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Ftraps.c;h=58b1f208eff5186aae3b08825f1d0581b47ba275;hp=492a60febb1119dcb80e29d5dd9f4b6d6914e86c;hb=58390c8ce1bddb6c623f62e7ed36383e7fa5c02f;hpb=e51b4198396cd715b140c0e8b259680429ff0cfb

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 492a60febb11..58b1f208eff5 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -671,15 +671,15 @@ static bool try_fixup_enqcmd_gp(void)
 	if (!cpu_feature_enabled(X86_FEATURE_ENQCMD))
 		return false;
 
-	pasid = current->mm->pasid;
-
 	/*
 	 * If the mm has not been allocated a
 	 * PASID, the #GP can not be fixed up.
 	 */
-	if (!pasid_valid(pasid))
+	if (!mm_valid_pasid(current->mm))
 		return false;
 
+	pasid = current->mm->pasid;
+
 	/*
 	 * Did this thread already have its PASID activated?
 	 * If so, the #GP must be from something else.