diff options
| author | Richard Weinberger <richard@nod.at> | 2011-08-18 23:55:11 +0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 17:15:37 +0400 |
| commit | d0af6cbfa2eb675643cc651114364752e972900b (patch) | |
| tree | a8ecae20a0c8d709cc655c3c62ccc9b4f7a58e57 | |
| parent | 73395a0002aa9573ffc8d989587b79663847f705 (diff) | |
| download | linux-d0af6cbfa2eb675643cc651114364752e972900b.tar.xz | |
um: merge delay_{32,64}.c
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | arch/x86/um/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/um/delay.c (renamed from arch/x86/um/delay_32.c) | 0 | ||||
| -rw-r--r-- | arch/x86/um/delay_64.c | 60 |
3 files changed, 1 insertions, 61 deletions
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index ffe1008a3f43..8fb58400e415 100644 --- a/arch/x86/um/Makefile +++ b/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/arch/x86/um/delay_32.c b/arch/x86/um/delay.c index f3fe1a688f7e..f3fe1a688f7e 100644 --- a/arch/x86/um/delay_32.c +++ b/arch/x86/um/delay.c diff --git a/arch/x86/um/delay_64.c b/arch/x86/um/delay_64.c deleted file mode 100644 index f3fe1a688f7e..000000000000 --- a/arch/x86/um/delay_64.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2011 Richard Weinberger <richrd@nod.at> - * Mostly copied from arch/x86/lib/delay.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/delay.h> -#include <asm/param.h> - -void __delay(unsigned long loops) -{ - asm volatile( - "test %0,%0\n" - "jz 3f\n" - "jmp 1f\n" - - ".align 16\n" - "1: jmp 2f\n" - - ".align 16\n" - "2: dec %0\n" - " jnz 2b\n" - "3: dec %0\n" - - : /* we don't need output */ - : "a" (loops) - ); -} -EXPORT_SYMBOL(__delay); - -inline void __const_udelay(unsigned long xloops) -{ - int d0; - - xloops *= 4; - asm("mull %%edx" - : "=d" (xloops), "=&a" (d0) - : "1" (xloops), "0" - (loops_per_jiffy * (HZ/4))); - - __delay(++xloops); -} -EXPORT_SYMBOL(__const_udelay); - -void __udelay(unsigned long usecs) -{ - __const_udelay(usecs * 0x000010c7); /* 2**32 / 1000000 (rounded up) */ -} -EXPORT_SYMBOL(__udelay); - -void __ndelay(unsigned long nsecs) -{ - __const_udelay(nsecs * 0x00005); /* 2**32 / 1000000000 (rounded up) */ -} -EXPORT_SYMBOL(__ndelay); |