Commit-ID: 19a433f45135656d065bdf1bbe543796b194ba3a
Gitweb: http://git.kernel.org/tip/19a433f45135656d065bdf1bbe543796b194ba3a
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Wed, 3 Jun 2015 18:00:59 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Wed, 3 Jun 2015 18:51:32 +0200
x86/asm/entry: Move the compat syscall entry code to arch/x86/entry/
Move the ia32entry.S file over into arch/x86/entry/.
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 | 5 ++++-
arch/x86/{ia32 => entry}/ia32entry.S | 0
arch/x86/ia32/Makefile | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index fa7e0cf..4a62659 100644
--- a/arch/x86/entry/Makefile
+++ b/arch/x86/entry/Makefile
@@ -1,4 +1,7 @@
#
# Makefile for the x86 low level entry code
#
-obj-y := entry_$(BITS).o
+obj-y := entry_$(BITS).o
+
+obj-$(CONFIG_IA32_EMULATION) += ia32entry.o
+
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/entry/ia32entry.S
similarity index 100%
rename from arch/x86/ia32/ia32entry.S
rename to arch/x86/entry/ia32entry.S
diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile
index bb635c6..cd4339b 100644
--- a/arch/x86/ia32/Makefile
+++ b/arch/x86/ia32/Makefile
@@ -2,7 +2,7 @@
# Makefile for the ia32 kernel emulation subsystem.
#
-obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o
+obj-$(CONFIG_IA32_EMULATION) := sys_ia32.o ia32_signal.o
obj-$(CONFIG_IA32_AOUT) += ia32_aout.o
--
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
|