Commit-ID: e6b93f4e48af8fe8373ec1132b8c7787890e7578
Gitweb: http://git.kernel.org/tip/e6b93f4e48af8fe8373ec1132b8c7787890e7578
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Wed, 3 Jun 2015 18:10:43 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 4 Jun 2015 07:37:33 +0200
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@xxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
Cc: Brian Gerst <brgerst@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/entry/Makefile | 3 +--
arch/x86/{lib => entry}/thunk_32.S | 0
arch/x86/{lib => entry}/thunk_64.S | 0
arch/x86/lib/Makefile | 1 -
arch/x86/um/Makefile | 2 +-
5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index c975324..9df72c8 100644
--- 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 --git a/arch/x86/lib/thunk_32.S b/arch/x86/entry/thunk_32.S
similarity index 100%
rename from arch/x86/lib/thunk_32.S
rename to arch/x86/entry/thunk_32.S
diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/entry/thunk_64.S
similarity index 100%
rename from arch/x86/lib/thunk_64.S
rename to arch/x86/entry/thunk_64.S
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 982989d..f258788 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -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
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
index acb384d..a8fecc2 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
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|