diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-03 18:00:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-03 18:51:32 +0200 |
| commit | 19a433f45135656d065bdf1bbe543796b194ba3a (patch) | |
| tree | dccbde4ce9cc48d54ca9d1760de613789df6d195 /arch/x86 | |
| parent | 905a36a2851838bca5a424fb758e201990234e6e (diff) | |
| download | linux-19a433f45135656d065bdf1bbe543796b194ba3a.tar.gz linux-19a433f45135656d065bdf1bbe543796b194ba3a.tar.bz2 linux-19a433f45135656d065bdf1bbe543796b194ba3a.zip | |
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@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')
| -rw-r--r-- | arch/x86/entry/Makefile | 5 | ||||
| -rw-r--r-- | arch/x86/entry/ia32entry.S (renamed from arch/x86/ia32/ia32entry.S) | 0 | ||||
| -rw-r--r-- | 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 index 2be23c734db5..2be23c734db5 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/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 |