Move the ia32entry.S file over into arch/x86/entry/.

Cc: Borislav Petkov <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 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 fa7e0cf6d3c4..4a626594fa79 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 bb635c641869..cd4339bae066 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
 
-- 
2.1.4

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

Reply via email to