Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b5de3a authored by Jiri Slaby's avatar Jiri Slaby Committed by Thomas Gleixner
Browse files

x86/idt: Remove superfluous ALIGNment 



Commit 87e81786 ("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: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarThomas 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
parent 594a30fb

arch/x86/kernel/head_32.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -465,7 +465,6 @@ early_idt_handler_common: 
ENDPROC(early_idt_handler_common)

ENDPROC(early_idt_handler_common)





/* This is the default interrupt "handler" :-) */

/* This is the default interrupt "handler" :-) */

	ALIGN

ENTRY(early_ignore_irq)

ENTRY(early_ignore_irq)

	cld

	cld

#ifdef CONFIG_PRINTK

#ifdef CONFIG_PRINTK
@@ -502,6 +501,7 @@ hlt_loop: 
	hlt

	hlt

	jmp hlt_loop

	jmp hlt_loop

ENDPROC(early_ignore_irq)

ENDPROC(early_ignore_irq)



__INITDATA

__INITDATA

	.align 4

	.align 4

GLOBAL(early_recursion_flag)

GLOBAL(early_recursion_flag)