---

yaml --- r: 65581 b: refs/heads/master c: 2db55d3 h: refs/heads/master i: 65579: ba9eac1 v: v3
git-mirror · Oct 11, 2007 · 1526c54 · 1526c54
1 parent 64b29ee
commit 1526c54
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33fc6d51336046bd6e8c7d1a42faff881fa6fb45
+refs/heads/master: 2db55d344e529492545cb3b755c7e9ba8e4fa94e
diff --git a/trunk/arch/x86_64/ia32/Makefile → trunk/arch/x86/ia32/Makefile b/trunk/arch/x86_64/ia32/Makefile → trunk/arch/x86/ia32/Makefile
diff --git a/trunk/arch/x86_64/ia32/audit.c → trunk/arch/x86/ia32/audit.c b/trunk/arch/x86_64/ia32/audit.c → trunk/arch/x86/ia32/audit.c
diff --git a/trunk/arch/x86_64/ia32/fpu32.c → trunk/arch/x86/ia32/fpu32.c b/trunk/arch/x86_64/ia32/fpu32.c → trunk/arch/x86/ia32/fpu32.c
diff --git a/trunk/arch/x86_64/ia32/ia32_aout.c → trunk/arch/x86/ia32/ia32_aout.c b/trunk/arch/x86_64/ia32/ia32_aout.c → trunk/arch/x86/ia32/ia32_aout.c
diff --git a/trunk/arch/x86_64/ia32/ia32_binfmt.c → trunk/arch/x86/ia32/ia32_binfmt.c b/trunk/arch/x86_64/ia32/ia32_binfmt.c → trunk/arch/x86/ia32/ia32_binfmt.c
diff --git a/trunk/arch/x86_64/ia32/ia32_signal.c → trunk/arch/x86/ia32/ia32_signal.c b/trunk/arch/x86_64/ia32/ia32_signal.c → trunk/arch/x86/ia32/ia32_signal.c
diff --git a/trunk/arch/x86_64/ia32/ia32entry.S → trunk/arch/x86/ia32/ia32entry.S b/trunk/arch/x86_64/ia32/ia32entry.S → trunk/arch/x86/ia32/ia32entry.S
diff --git a/trunk/arch/x86_64/ia32/ipc32.c → trunk/arch/x86/ia32/ipc32.c b/trunk/arch/x86_64/ia32/ipc32.c → trunk/arch/x86/ia32/ipc32.c
diff --git a/trunk/arch/x86_64/ia32/mmap32.c → trunk/arch/x86/ia32/mmap32.c b/trunk/arch/x86_64/ia32/mmap32.c → trunk/arch/x86/ia32/mmap32.c
diff --git a/trunk/arch/x86_64/ia32/ptrace32.c → trunk/arch/x86/ia32/ptrace32.c b/trunk/arch/x86_64/ia32/ptrace32.c → trunk/arch/x86/ia32/ptrace32.c
diff --git a/trunk/arch/x86_64/ia32/sys_ia32.c → trunk/arch/x86/ia32/sys_ia32.c b/trunk/arch/x86_64/ia32/sys_ia32.c → trunk/arch/x86/ia32/sys_ia32.c
diff --git a/trunk/arch/x86_64/ia32/syscall32.c → trunk/arch/x86/ia32/syscall32.c b/trunk/arch/x86_64/ia32/syscall32.c → trunk/arch/x86/ia32/syscall32.c
diff --git a/trunk/arch/x86_64/ia32/syscall32_syscall.S → trunk/arch/x86/ia32/syscall32_syscall.S b/trunk/arch/x86_64/ia32/syscall32_syscall.S → trunk/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/trunk/arch/x86_64/ia32/tls32.c → trunk/arch/x86/ia32/tls32.c b/trunk/arch/x86_64/ia32/tls32.c → trunk/arch/x86/ia32/tls32.c
diff --git a/trunk/arch/x86_64/ia32/vsyscall-sigreturn.S → trunk/arch/x86/ia32/vsyscall-sigreturn.S b/trunk/arch/x86_64/ia32/vsyscall-sigreturn.S → trunk/arch/x86/ia32/vsyscall-sigreturn.S
diff --git a/trunk/arch/x86_64/ia32/vsyscall-syscall.S → trunk/arch/x86/ia32/vsyscall-syscall.S b/trunk/arch/x86_64/ia32/vsyscall-syscall.S → trunk/arch/x86/ia32/vsyscall-syscall.S
diff --git a/trunk/arch/x86_64/ia32/vsyscall-sysenter.S → trunk/arch/x86/ia32/vsyscall-sysenter.S b/trunk/arch/x86_64/ia32/vsyscall-sysenter.S → trunk/arch/x86/ia32/vsyscall-sysenter.S
diff --git a/trunk/arch/x86_64/ia32/vsyscall.lds → trunk/arch/x86/ia32/vsyscall.lds b/trunk/arch/x86_64/ia32/vsyscall.lds → trunk/arch/x86/ia32/vsyscall.lds
diff --git a/trunk/arch/x86_64/Makefile b/trunk/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/