x86-64: make BUILD_IRQ() also reset section back

Commit 9d25d4db81833029d30b7b03cc1000cbbe09e192 ("x86: BUILD_IRQ say
.text to avoid .data.percpu") added a ".text" specifier to make sure
that BUILD_IRQ() builds the irq trampoline in the text segment rather
than in some random left-over segment that the compiler happened to
leave the asm in.

However, we should also make sure that we switch back by adding a
".previous" at the end, so that there are no subtle issues with
subsequent compiler-generated code.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c
index 9414125f19ce9d14ca3a1e7c3b2e52d9b62f962e..1f26fd9ec4f4ea101c69ee030ac4142f4458d5ae 100644 (file)
--- a/arch/x86/kernel/irqinit_64.c
+++ b/arch/x86/kernel/irqinit_64.c
@@ -46,7 +46,8 @@
        asm("\n.text\n.p2align\n"               \
            "IRQ" #nr "_interrupt:\n\t"         \
            "push $~(" #nr ") ; "               \
-           "jmp common_interrupt");
+           "jmp common_interrupt\n"            \
+           ".previous");
 
 #define BI(x,y) \
        BUILD_IRQ(x##y)