Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -4
+1 -2
arch/x86/entry/Makefile
··· 1 1 # 2 2 # Makefile for the x86 low level entry code 3 3 # 4 - obj-y := entry_$(BITS).o 5 - 4 + obj-y := entry_$(BITS).o thunk_$(BITS).o 6 5 obj-y += vdso/ 7 6 8 7 obj-$(CONFIG_IA32_EMULATION) += ia32entry.o
-1
arch/x86/lib/Makefile
··· 17 17 obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o 18 18 19 19 lib-y := delay.o misc.o cmdline.o 20 - lib-y += thunk_$(BITS).o 21 20 lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o 22 21 lib-y += memcpy_$(BITS).o 23 22 lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
arch/x86/lib/thunk_32.S arch/x86/entry/thunk_32.S
arch/x86/lib/thunk_64.S arch/x86/entry/thunk_64.S
+1 -1
arch/x86/um/Makefile
··· 26 26 27 27 obj-y += syscalls_64.o vdso/ 28 28 29 - subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../lib/thunk_64.o \ 29 + subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o \ 30 30 ../lib/rwsem.o 31 31 32 32 endif