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 <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Ingo Molnar <[email protected]> --- arch/x86/kernel/head_32.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.14.1
