From: Thomas Gleixner Date: Thu, 11 Oct 2007 09:17:21 +0000 (+0200) Subject: x86_64: move ia32 X-Git-Tag: v2.6.24-rc1~1474 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2db55d344e529492545cb3b755c7e9ba8e4fa94e;p=linux-2.6-omap-h63xx.git x86_64: move ia32 Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- diff --git a/arch/x86_64/ia32/Makefile b/arch/x86/ia32/Makefile similarity index 100% rename from arch/x86_64/ia32/Makefile rename to arch/x86/ia32/Makefile diff --git a/arch/x86_64/ia32/audit.c b/arch/x86/ia32/audit.c similarity index 100% rename from arch/x86_64/ia32/audit.c rename to arch/x86/ia32/audit.c diff --git a/arch/x86_64/ia32/fpu32.c b/arch/x86/ia32/fpu32.c similarity index 100% rename from arch/x86_64/ia32/fpu32.c rename to arch/x86/ia32/fpu32.c diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c similarity index 100% rename from arch/x86_64/ia32/ia32_aout.c rename to arch/x86/ia32/ia32_aout.c diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c similarity index 100% rename from arch/x86_64/ia32/ia32_binfmt.c rename to arch/x86/ia32/ia32_binfmt.c diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c similarity index 100% rename from arch/x86_64/ia32/ia32_signal.c rename to arch/x86/ia32/ia32_signal.c diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S similarity index 100% rename from arch/x86_64/ia32/ia32entry.S rename to arch/x86/ia32/ia32entry.S diff --git a/arch/x86_64/ia32/ipc32.c b/arch/x86/ia32/ipc32.c similarity index 100% rename from arch/x86_64/ia32/ipc32.c rename to arch/x86/ia32/ipc32.c diff --git a/arch/x86_64/ia32/mmap32.c b/arch/x86/ia32/mmap32.c similarity index 100% rename from arch/x86_64/ia32/mmap32.c rename to arch/x86/ia32/mmap32.c diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86/ia32/ptrace32.c similarity index 100% rename from arch/x86_64/ia32/ptrace32.c rename to arch/x86/ia32/ptrace32.c diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c similarity index 100% rename from arch/x86_64/ia32/sys_ia32.c rename to arch/x86/ia32/sys_ia32.c diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86/ia32/syscall32.c similarity index 100% rename from arch/x86_64/ia32/syscall32.c rename to arch/x86/ia32/syscall32.c diff --git a/arch/x86_64/ia32/syscall32_syscall.S b/arch/x86/ia32/syscall32_syscall.S similarity index 73% rename from arch/x86_64/ia32/syscall32_syscall.S rename to arch/x86/ia32/syscall32_syscall.S index 8f8271bdf13..933f0f08b1c 100644 --- a/arch/x86_64/ia32/syscall32_syscall.S +++ b/arch/x86/ia32/syscall32_syscall.S @@ -6,12 +6,12 @@ .globl syscall32_syscall_end syscall32_syscall: - .incbin "arch/x86_64/ia32/vsyscall-syscall.so" + .incbin "arch/x86/ia32/vsyscall-syscall.so" syscall32_syscall_end: .globl syscall32_sysenter .globl syscall32_sysenter_end syscall32_sysenter: - .incbin "arch/x86_64/ia32/vsyscall-sysenter.so" + .incbin "arch/x86/ia32/vsyscall-sysenter.so" syscall32_sysenter_end: diff --git a/arch/x86_64/ia32/tls32.c b/arch/x86/ia32/tls32.c similarity index 100% rename from arch/x86_64/ia32/tls32.c rename to arch/x86/ia32/tls32.c diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86/ia32/vsyscall-sigreturn.S similarity index 100% rename from arch/x86_64/ia32/vsyscall-sigreturn.S rename to arch/x86/ia32/vsyscall-sigreturn.S diff --git a/arch/x86_64/ia32/vsyscall-syscall.S b/arch/x86/ia32/vsyscall-syscall.S similarity index 100% rename from arch/x86_64/ia32/vsyscall-syscall.S rename to arch/x86/ia32/vsyscall-syscall.S diff --git a/arch/x86_64/ia32/vsyscall-sysenter.S b/arch/x86/ia32/vsyscall-sysenter.S similarity index 100% rename from arch/x86_64/ia32/vsyscall-sysenter.S rename to arch/x86/ia32/vsyscall-sysenter.S diff --git a/arch/x86_64/ia32/vsyscall.lds b/arch/x86/ia32/vsyscall.lds similarity index 100% rename from arch/x86_64/ia32/vsyscall.lds rename to arch/x86/ia32/vsyscall.lds diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 4208a0ded52..189d80d3a89 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile @@ -78,7 +78,7 @@ core-y += arch/x86_64/kernel/ \ arch/x86/mm/ \ arch/x86/crypto/ \ arch/x86/vdso/ -core-$(CONFIG_IA32_EMULATION) += arch/x86_64/ia32/ +core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/ drivers-$(CONFIG_PCI) += arch/x86/pci/ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/