x86_64: move ia32

Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
author: Thomas Gleixner <tglx@linutronix.de> 2007-10-11 05:17:21 -0400
committer: Thomas Gleixner <tglx@linutronix.de> 2007-10-11 05:17:21 -0400
commit: 2db55d344e529492545cb3b755c7e9ba8e4fa94e (patch)
tree: fea163affb8eec3d927acb498cb3aa1b13c053b8
parent: 33fc6d51336046bd6e8c7d1a42faff881fa6fb45 (diff)
19 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/ia32/Makefile b/arch/x86/ia32/Makefile
index cdae36435e21..cdae36435e21 100644
--- a/arch/x86_64/ia32/Makefile
+++ b/arch/x86/ia32/Makefile
diff --git a/arch/x86_64/ia32/audit.c b/arch/x86/ia32/audit.c
index 8850fe40ea34..8850fe40ea34 100644
--- a/arch/x86_64/ia32/audit.c
+++ b/arch/x86/ia32/audit.c
diff --git a/arch/x86_64/ia32/fpu32.c b/arch/x86/ia32/fpu32.c
index 2c8209a3605a..2c8209a3605a 100644
--- a/arch/x86_64/ia32/fpu32.c
+++ b/arch/x86/ia32/fpu32.c
diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index 08781370256d..08781370256d 100644
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c
index dffd2ac72747..dffd2ac72747 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86/ia32/ia32_binfmt.c
diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 6ea19c25f90d..6ea19c25f90d 100644
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 18b231810908..18b231810908 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
diff --git a/arch/x86_64/ia32/ipc32.c b/arch/x86/ia32/ipc32.c
index 369151dc3213..369151dc3213 100644
--- a/arch/x86_64/ia32/ipc32.c
+++ b/arch/x86/ia32/ipc32.c
diff --git a/arch/x86_64/ia32/mmap32.c b/arch/x86/ia32/mmap32.c
index e4b84b4a417a..e4b84b4a417a 100644
--- a/arch/x86_64/ia32/mmap32.c
+++ b/arch/x86/ia32/mmap32.c
diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86/ia32/ptrace32.c
index 4a233ad6269c..4a233ad6269c 100644
--- a/arch/x86_64/ia32/ptrace32.c
+++ b/arch/x86/ia32/ptrace32.c
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index bee96d614432..bee96d614432 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86/ia32/syscall32.c
index 15013bac181c..15013bac181c 100644
--- a/arch/x86_64/ia32/syscall32.c
+++ b/arch/x86/ia32/syscall32.c
diff --git a/arch/x86_64/ia32/syscall32_syscall.S b/arch/x86/ia32/syscall32_syscall.S
index 8f8271bdf135..933f0f08b1cf 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
index 1cc4340de3ca..1cc4340de3ca 100644
--- a/arch/x86_64/ia32/tls32.c
+++ b/arch/x86/ia32/tls32.c
diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86/ia32/vsyscall-sigreturn.S
index b383be00baec..b383be00baec 100644
--- a/arch/x86_64/ia32/vsyscall-sigreturn.S
+++ b/arch/x86/ia32/vsyscall-sigreturn.S
diff --git a/arch/x86_64/ia32/vsyscall-syscall.S b/arch/x86/ia32/vsyscall-syscall.S
index cf9ef678de3e..cf9ef678de3e 100644
--- a/arch/x86_64/ia32/vsyscall-syscall.S
+++ b/arch/x86/ia32/vsyscall-syscall.S
diff --git a/arch/x86_64/ia32/vsyscall-sysenter.S b/arch/x86/ia32/vsyscall-sysenter.S
index ae056e553d13..ae056e553d13 100644
--- a/arch/x86_64/ia32/vsyscall-sysenter.S
+++ b/arch/x86/ia32/vsyscall-sysenter.S
diff --git a/arch/x86_64/ia32/vsyscall.lds b/arch/x86/ia32/vsyscall.lds
index 1dc86ff5bcb9..1dc86ff5bcb9 100644
--- a/arch/x86_64/ia32/vsyscall.lds
+++ b/arch/x86/ia32/vsyscall.lds
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 4208a0ded529..189d80d3a891 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/
author	Thomas Gleixner <tglx@linutronix.de>	2007-10-11 05:17:21 -0400
committer	Thomas Gleixner <tglx@linutronix.de>	2007-10-11 05:17:21 -0400
commit	2db55d344e529492545cb3b755c7e9ba8e4fa94e (patch)
tree	fea163affb8eec3d927acb498cb3aa1b13c053b8
parent	33fc6d51336046bd6e8c7d1a42faff881fa6fb45 (diff)

diff --git a/arch/x86_64/ia32/Makefile b/arch/x86/ia32/Makefile index cdae36435e21..cdae36435e21 100644 --- a/arch/x86_64/ia32/Makefile +++ b/arch/x86/ia32/Makefile


diff --git a/arch/x86_64/ia32/audit.c b/arch/x86/ia32/audit.c index 8850fe40ea34..8850fe40ea34 100644 --- a/arch/x86_64/ia32/audit.c +++ b/arch/x86/ia32/audit.c


diff --git a/arch/x86_64/ia32/fpu32.c b/arch/x86/ia32/fpu32.c index 2c8209a3605a..2c8209a3605a 100644 --- a/arch/x86_64/ia32/fpu32.c +++ b/arch/x86/ia32/fpu32.c


diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index 08781370256d..08781370256d 100644 --- a/arch/x86_64/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c


diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c index dffd2ac72747..dffd2ac72747 100644 --- a/arch/x86_64/ia32/ia32_binfmt.c +++ b/arch/x86/ia32/ia32_binfmt.c


diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index 6ea19c25f90d..6ea19c25f90d 100644 --- a/arch/x86_64/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c


diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 18b231810908..18b231810908 100644 --- a/arch/x86_64/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S


diff --git a/arch/x86_64/ia32/ipc32.c b/arch/x86/ia32/ipc32.c index 369151dc3213..369151dc3213 100644 --- a/arch/x86_64/ia32/ipc32.c +++ b/arch/x86/ia32/ipc32.c


diff --git a/arch/x86_64/ia32/mmap32.c b/arch/x86/ia32/mmap32.c index e4b84b4a417a..e4b84b4a417a 100644 --- a/arch/x86_64/ia32/mmap32.c +++ b/arch/x86/ia32/mmap32.c


diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86/ia32/ptrace32.c index 4a233ad6269c..4a233ad6269c 100644 --- a/arch/x86_64/ia32/ptrace32.c +++ b/arch/x86/ia32/ptrace32.c


diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c index bee96d614432..bee96d614432 100644 --- a/arch/x86_64/ia32/sys_ia32.c +++ b/arch/x86/ia32/sys_ia32.c


diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86/ia32/syscall32.c index 15013bac181c..15013bac181c 100644 --- a/arch/x86_64/ia32/syscall32.c +++ b/arch/x86/ia32/syscall32.c


diff --git a/arch/x86_64/ia32/syscall32_syscall.S b/arch/x86/ia32/syscall32_syscall.S index 8f8271bdf135..933f0f08b1cf 100644 --- a/arch/x86_64/ia32/syscall32_syscall.S +++ b/arch/x86/ia32/syscall32_syscall.S
@@ -6,12 +6,12 @@
6	.globl syscall32_syscall_end	6	.globl syscall32_syscall_end
7		7
8	syscall32_syscall:	8	syscall32_syscall:
9	.incbin "arch/x86_64/ia32/vsyscall-syscall.so"	9	.incbin "arch/x86/ia32/vsyscall-syscall.so"
10	syscall32_syscall_end:	10	syscall32_syscall_end:
11		11
12	.globl syscall32_sysenter	12	.globl syscall32_sysenter
13	.globl syscall32_sysenter_end	13	.globl syscall32_sysenter_end
14		14
15	syscall32_sysenter:	15	syscall32_sysenter:
16	.incbin "arch/x86_64/ia32/vsyscall-sysenter.so"	16	.incbin "arch/x86/ia32/vsyscall-sysenter.so"
17	syscall32_sysenter_end:	17	syscall32_sysenter_end:


diff --git a/arch/x86_64/ia32/tls32.c b/arch/x86/ia32/tls32.c index 1cc4340de3ca..1cc4340de3ca 100644 --- a/arch/x86_64/ia32/tls32.c +++ b/arch/x86/ia32/tls32.c


diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86/ia32/vsyscall-sigreturn.S index b383be00baec..b383be00baec 100644 --- a/arch/x86_64/ia32/vsyscall-sigreturn.S +++ b/arch/x86/ia32/vsyscall-sigreturn.S


diff --git a/arch/x86_64/ia32/vsyscall-syscall.S b/arch/x86/ia32/vsyscall-syscall.S index cf9ef678de3e..cf9ef678de3e 100644 --- a/arch/x86_64/ia32/vsyscall-syscall.S +++ b/arch/x86/ia32/vsyscall-syscall.S


diff --git a/arch/x86_64/ia32/vsyscall-sysenter.S b/arch/x86/ia32/vsyscall-sysenter.S index ae056e553d13..ae056e553d13 100644 --- a/arch/x86_64/ia32/vsyscall-sysenter.S +++ b/arch/x86/ia32/vsyscall-sysenter.S


diff --git a/arch/x86_64/ia32/vsyscall.lds b/arch/x86/ia32/vsyscall.lds index 1dc86ff5bcb9..1dc86ff5bcb9 100644 --- a/arch/x86_64/ia32/vsyscall.lds +++ b/arch/x86/ia32/vsyscall.lds


diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 4208a0ded529..189d80d3a891 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile
@@ -78,7 +78,7 @@ core-y += arch/x86_64/kernel/ \
78	arch/x86/mm/ \	78	arch/x86/mm/ \
79	arch/x86/crypto/ \	79	arch/x86/crypto/ \
80	arch/x86/vdso/	80	arch/x86/vdso/
81	core-$(CONFIG_IA32_EMULATION) += arch/x86_64/ia32/	81	core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/
82	drivers-$(CONFIG_PCI) += arch/x86/pci/	82	drivers-$(CONFIG_PCI) += arch/x86/pci/
83	drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/	83	drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
84		84