summaryrefslogtreecommitdiffstats
path: root/arch/x86/um
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-03 18:10:43 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-04 07:37:33 +0200
commite6b93f4e48af8fe8373ec1132b8c7787890e7578 (patch)
tree70b671e7bba3b54a826be70d24eacdb88e1966df /arch/x86/um
parentx86/asm/entry, x86/vdso: Move the vDSO code to arch/x86/entry/vdso/ (diff)
downloadlinux-e6b93f4e48af8fe8373ec1132b8c7787890e7578.tar.xz
linux-e6b93f4e48af8fe8373ec1132b8c7787890e7578.zip
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>
Diffstat (limited to 'arch/x86/um')
-rw-r--r--arch/x86/um/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
index acb384d24669..a8fecc226946 100644
--- a/arch/x86/um/Makefile
+++ b/arch/x86/um/Makefile
@@ -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