summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2017-08-31 14:16:53 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-08-31 15:47:02 +0200
commit04b5de3a8f54fad8bb838827de85381bc6a5bc61 (patch)
treef06a53aebd91a7d8e330c2f1ac347ab565d2f30c
parentx86/apic: Silence "FW_BUG TSC_DEADLINE disabled due to Errata" on CPUs withou... (diff)
downloadlinux-04b5de3a8f54fad8bb838827de85381bc6a5bc61.tar.xz
linux-04b5de3a8f54fad8bb838827de85381bc6a5bc61.zip
x86/idt: Remove superfluous ALIGNment
Commit 87e81786b13b ("x86/idt: Move early IDT setup out of 32-bit asm") switched early_ignore_irq to use ENTRY. ENTRY aligns the code, so there is no need for one more ALIGN right before the function. And add one \n after the function to separate it from the data. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Brian Gerst <brgerst@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Link: http://lkml.kernel.org/r/20170831121653.28917-1-jslaby@suse.cz
-rw-r--r--arch/x86/kernel/head_32.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index a615a5efa8ec..9ed3074d0d27 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -465,7 +465,6 @@ early_idt_handler_common:
ENDPROC(early_idt_handler_common)
/* This is the default interrupt "handler" :-) */
- ALIGN
ENTRY(early_ignore_irq)
cld
#ifdef CONFIG_PRINTK
@@ -502,6 +501,7 @@ hlt_loop:
hlt
jmp hlt_loop
ENDPROC(early_ignore_irq)
+
__INITDATA
.align 4
GLOBAL(early_recursion_flag)