---

yaml --- r: 273062 b: refs/heads/master c: d0af6cb h: refs/heads/master v: v3
git-mirror · Nov 2, 2011 · 4288e92 · 4288e92
1 parent 6f086ed
commit 4288e92
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 62 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73395a0002aa9573ffc8d989587b79663847f705
+refs/heads/master: d0af6cbfa2eb675643cc651114364752e972900b
diff --git a/trunk/arch/x86/um/Makefile b/trunk/arch/x86/um/Makefile
@@ -8,7 +8,7 @@ else
 	BITS := 64
 endif
 
-obj-y = bug.o bugs_$(BITS).o delay_$(BITS).o fault.o ksyms.o ldt.o \
+obj-y = bug.o bugs_$(BITS).o delay.o fault.o ksyms.o ldt.o \
 	ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \
 	stub_$(BITS).o stub_segv.o syscalls_$(BITS).o \
 	sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \

diff --git a/trunk/arch/x86/um/delay_32.c → trunk/arch/x86/um/delay.c b/trunk/arch/x86/um/delay_32.c → trunk/arch/x86/um/delay.c
diff --git a/trunk/arch/x86/um/delay_64.c b/trunk/arch/x86/um/delay_64.c