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

[linux-2.6-block.git] / arch / x86 / entry / entry_32.S

diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index c73047bf9f4bff9c4631c0eab383cedceda41918..4e295798638b8176de7bd5f341f063124c60ce49 100644 (file)
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -305,7 +305,7 @@
 .macro CHECK_AND_APPLY_ESPFIX
 #ifdef CONFIG_X86_ESPFIX32
 #define GDT_ESPFIX_OFFSET (GDT_ENTRY_ESPFIX_SS * 8)
-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + GDT_ESPFIX_OFFSET
+#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page + GDT_ESPFIX_OFFSET)
 
        ALTERNATIVE     "jmp .Lend_\@", "", X86_BUG_ESPFIX