Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1157863

[PATCH 4/7] x86/asm/entry: Move the 'thunk' functions to arch/x86/entry/

Show all headers | View raw

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>
---
 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 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index c97532492ef5..9df72c8a0ac2 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 982989d282ff..f2587888d987 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
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC PATCH 0/7] x86/entry: Create a home for the x86 entry code in arch/x86/entry/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:10 +0200
  [PATCH 1/7] x86/asm/entry: Move entry_64.S and entry_32.S to arch/x86/entry/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:10 +0200
  [PATCH 4/7] x86/asm/entry: Move the 'thunk' functions to arch/x86/entry/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:10 +0200
  Re: [PATCH 3/7] x86/asm/entry, x86/vdso: Move the vDSO code to arch/x86/entry/vdso/ Andy Lutomirski <luto@amacapital.net> - 2015-06-03 19:10 +0200
  [PATCH 7/7] x86/asm/entry: Move the vsyscall code to arch/x86/entry/vsyscall/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:10 +0200
  Re: [RFC PATCH 0/7] x86/entry: Create a home for the x86 entry code  in arch/x86/entry/ Andy Lutomirski <luto@amacapital.net> - 2015-06-03 19:10 +0200
    Re: [RFC PATCH 0/7] x86/entry: Create a home for the x86 entry code  in arch/x86/entry/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:20 +0200
  [PATCH 5/7] x86/asm/entry: Move arch/x86/include/asm/calling.h to arch/x86/entry/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:10 +0200
  Re: [PATCH 2/7] x86/asm/entry: Move the compat syscall entry code to arch/x86/entry/ Andy Lutomirski <luto@amacapital.net> - 2015-06-03 19:10 +0200
    Re: [PATCH 2/7] x86/asm/entry: Move the compat syscall entry code to  arch/x86/entry/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:20 +0200
  [PATCH 3/7] x86/asm/entry, x86/vdso: Move the vDSO code to arch/x86/entry/vdso/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:10 +0200
  [PATCH 2/7] x86/asm/entry: Move the compat syscall entry code to arch/x86/entry/ Ingo Molnar <mingo@kernel.org> - 2015-06-03 19:10 +0200
  Re: [RFC PATCH 0/7] x86/entry: Create a home for the x86 entry code  in arch/x86/entry/ Andy Lutomirski <luto@amacapital.net> - 2015-06-03 19:20 +0200

csiph-web