2 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 7eb1678e098d..2dc5c01f754d 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -617,8 +617,7 @@ retint_signal:
 #ifdef CONFIG_PREEMPT
         /* Returning to kernel space. Check if we need preemption */
         /* rcx:  threadinfo. interrupts off. */
-        .p2align
-retint_kernel:  
+ENTRY(retint_kernel)
         cmpl $0,threadinfo_preempt_count(%rcx)
         jnz  retint_restore_args
         bt  $TIF_NEED_RESCHED,threadinfo_flags(%rcx)
diff --git a/include/asm-x86_64/linkage.h b/include/asm-x86_64/linkage.h
index 291c2d01c44f..b5f39d0189ce 100644
--- a/include/asm-x86_64/linkage.h
+++ b/include/asm-x86_64/linkage.h
@@ -1,6 +1,6 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
-/* Nothing to see here... */
+#define __ALIGN .p2align 4,,15
 
 #endif