[PATCH] UML: Separate out the time code

Move the i386 __delay to sys-i386 and add an implementation for x86_64.
Also get rid of the definition of um_udelay_t.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
index 498344110eee0374682ec4e7f930290c9194caea..3b538f6cc3aea443f2a7bcc08f2276161041097e 100644 (file)
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
@@ -136,22 +136,7 @@ long um_stime(int * tptr)
        return 0;
 }
 
-/* XXX Needs to be moved under sys-i386 */
-void __delay(um_udelay_t time)
-{
-       /* Stolen from the i386 __loop_delay */
-       int d0;
-       __asm__ __volatile__(
-               "\tjmp 1f\n"
-               ".align 16\n"
-               "1:\tjmp 2f\n"
-               ".align 16\n"
-               "2:\tdecl %0\n\tjns 2b"
-               :"=&a" (d0)
-               :"0" (time));
-}
-
-void __udelay(um_udelay_t usecs)
+void __udelay(unsigned long usecs)
 {
        int i, n;
 
@@ -159,7 +144,7 @@ void __udelay(um_udelay_t usecs)
        for(i=0;i<n;i++) ;
 }
 
-void __const_udelay(um_udelay_t usecs)
+void __const_udelay(unsigned long usecs)
 {
        int i, n;
 

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 45cc75f63a756fc741583715d9f8d6f77391c80c..8a0994b696b00f430b29caf51002ddfc1bee1617 100644 (file)
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,4 +1,4 @@
-obj-y = bitops.o bugs.o checksum.o fault.o ksyms.o ldt.o ptrace.o \
+obj-y = bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
        ptrace_user.o semaphore.o signal.o sigcontext.o syscalls.o sysrq.o
 
 obj-$(CONFIG_HIGHMEM) += highmem.o

diff --git a/arch/um/sys-i386/delay.c b/arch/um/sys-i386/delay.c
new file mode 100644 (file)
index 0000000..20d37db
--- /dev/null
+++ b/arch/um/sys-i386/delay.c
@@ -0,0 +1,14 @@
+void __delay(unsigned long time)
+{
+       /* Stolen from the i386 __loop_delay */
+       int d0;
+       __asm__ __volatile__(
+               "\tjmp 1f\n"
+               ".align 16\n"
+               "1:\tjmp 2f\n"
+               ".align 16\n"
+               "2:\tdecl %0\n\tjns 2b"
+               :"=&a" (d0)
+               :"0" (time));
+}
+

diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile
index 81e1659035704a5f9bc97bfb74efc20d8689abac..1ec504b7681091f21761dd425132b92ab0f6ddb0 100644 (file)
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
@@ -4,7 +4,7 @@
 # Licensed under the GPL
 #
 
-lib-y = bitops.o bugs.o csum-partial.o fault.o mem.o memcpy.o \
+lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o mem.o memcpy.o \
        ptrace.o ptrace_user.o semaphore.o sigcontext.o signal.o \
        syscalls.o sysrq.o thunk.o
 

diff --git a/arch/um/sys-x86_64/delay.c b/arch/um/sys-x86_64/delay.c
new file mode 100644 (file)
index 0000000..f3b5187
--- /dev/null
+++ b/arch/um/sys-x86_64/delay.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2003 PathScale, Inc.
+ * Copied from arch/x86_64
+ *
+ * Licensed under the GPL
+ */
+
+#include "asm/processor.h"
+
+void __delay(unsigned long loops)
+{
+       unsigned long i;
+
+       for(i = 0; i < loops; i++) ;
+}
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */

diff --git a/include/asm-um/archparam-i386.h b/include/asm-um/archparam-i386.h
index 0d3bad3efc3f56147b106002b44c1eaf7bcbbb3b..61de0d440cdc1b19a245fe62b01927b126cb9be1 100644 (file)
--- a/include/asm-um/archparam-i386.h
+++ b/include/asm-um/archparam-i386.h
@@ -136,10 +136,6 @@ if ( vsyscall_ehdr ) {                                                           \
 #define R_386_GOTPC    10
 #define R_386_NUM      11
 
-/********* Bits for asm-um/delay.h **********/
-
-typedef unsigned long um_udelay_t;
-
 /********* Nothing for asm-um/hardirq.h **********/
 
 /********* Nothing for asm-um/hw_irq.h **********/

diff --git a/include/asm-um/archparam-ppc.h b/include/asm-um/archparam-ppc.h
index 9b8b27e29551882911dfe3c60798a0d78cc5d9b3..0ebced92a7625d1ddc580ad55139b5dad9841b0b 100644 (file)
--- a/include/asm-um/archparam-ppc.h
+++ b/include/asm-um/archparam-ppc.h
@@ -21,10 +21,6 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #define ELF_DATA        ELFDATA2MSB
 #define ELF_ARCH       EM_PPC
 
-/********* Bits for asm-um/delay.h **********/
-
-typedef unsigned int um_udelay_t;
-
 /********* Bits for asm-um/hw_irq.h **********/
 
 struct hw_interrupt_type;