Skip to content

Commit

Permalink
x86/asm/entry: Move the 'thunk' functions to arch/x86/entry/
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ingo Molnar committed Jun 4, 2015
1 parent d603c8e commit e6b93f4
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions arch/x86/entry/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion arch/x86/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ clean-files := inat-tables.c
obj-$(CONFIG_SMP) += msr-smp.o cache-smp.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 += memcpy_$(BITS).o
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/um/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ else

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

endif
Expand Down

0 comments on commit e6b93f4

Please sign in to comment.