1 files changed, 5 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index d58184b7cd44..bcb75dc97d44 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -804,8 +804,11 @@ static void init_amd(struct cpuinfo_x86 *c)
         case 0x17: init_amd_zn(c); break;
         }
 
-        /* Enable workaround for FXSAVE leak */
-        if (c->x86 >= 6)
+        /*
+         * Enable workaround for FXSAVE leak on CPUs
+         * without a XSaveErPtr feature
+         */
+        if ((c->x86 >= 6) && (!cpu_has(c, X86_FEATURE_XSAVEERPTR)))
                 set_cpu_bug(c, X86_BUG_FXSAVE_LEAK);
 
         cpu_detect_cache_sizes(c);