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

Commit e6b93f4e authored Jun 03, 2015 by Ingo Molnar

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>

parent d603c8e1

arch/x86/entry/Makefile

+1 −2

Original line number	Original line	Diff line number	Diff line
	#		#
	# Makefile for the x86 low level entry code		# 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-y += vdso/

	obj-$(CONFIG_IA32_EMULATION) += ia32entry.o		obj-$(CONFIG_IA32_EMULATION) += ia32entry.o

arch/x86/lib/thunk_32.S→arch/x86/entry/thunk_32.S

+0 −0

File moved.

arch/x86/lib/thunk_64.S→arch/x86/entry/thunk_64.S

+0 −0

File moved.

arch/x86/lib/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@ clean-files := inat-tables.c
	obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o		obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o

	lib-y := delay.o misc.o cmdline.o		lib-y := delay.o misc.o cmdline.o
	lib-y += thunk_$(BITS).o
	lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o		lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o
	lib-y += memcpy_$(BITS).o		lib-y += memcpy_$(BITS).o
	lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o		lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o

arch/x86/um/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@ else

	obj-y += syscalls_64.o vdso/		obj-y += syscalls_64.o vdso/

	subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../lib/thunk_64.o \		subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o \
	../lib/rwsem.o		../lib/rwsem.o

	endif		endif