x86/asm/entry: Move the 'thunk' functions to arch/x86/entry/

These are all calling x86 entry code functions, so move them close
to other entry code.

Change lib-y to obj-y: there's no real difference between the two
as we don't really drop any of them during the linking stage, and
obj-y is the more common approach for core kernel object code.

Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index c975324..9df72c8 100644 (file)
--- a/arch/x86/entry/Makefile
+++ b/arch/x86/entry/Makefile
@@ -1,8 +1,7 @@
 #
 # Makefile for the x86 low level entry code
 #
-obj-y                          := entry_$(BITS).o
-
+obj-y                          := entry_$(BITS).o thunk_$(BITS).o
 obj-y                          += vdso/
 
 obj-$(CONFIG_IA32_EMULATION)   += ia32entry.o

diff --cc arch/x86/entry/thunk_32.S
Simple merge

diff --cc arch/x86/entry/thunk_64.S
Simple merge

diff --cc arch/x86/lib/Makefile
Simple merge

diff --cc arch/x86/um/Makefile
Simple merge