2 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index d394899e055c..5a9856eb12ba 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -39,6 +39,8 @@
 /* ... GDT has it cleared */
 #define SEGMENT_GDT             0x0
 
+#define GDT_ENTRY_INVALID_SEG   0
+
 #ifdef CONFIG_X86_32
 /*
  * The layout of the per-CPU GDT under Linux:
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d56d30714d43..3f70538012e2 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1184,7 +1184,7 @@ void syscall_init(void)
         wrmsrl_safe(MSR_IA32_SYSENTER_EIP, (u64)ia32_sysenter_target);
 #else
         wrmsrl(MSR_CSTAR, ignore_sysret);
-        wrmsrl_safe(MSR_IA32_SYSENTER_CS, 0ULL);
+        wrmsrl_safe(MSR_IA32_SYSENTER_CS, (u64)GDT_ENTRY_INVALID_SEG);
         wrmsrl_safe(MSR_IA32_SYSENTER_ESP, 0ULL);
         wrmsrl_safe(MSR_IA32_SYSENTER_EIP, 0ULL);
 #endif