[PATCH] uml: Delay loop cleanups

This patch cleans up the delay implementations a bit, makes the loops
unoptimizable, and exports __udelay and __const_udelay.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2005-05-20 13:59:08 -07:00 committed by Linus Torvalds
parent 13479d52c7
commit 060e352236
2 changed files with 27 additions and 22 deletions

View File

@ -1,5 +1,7 @@
#include "linux/delay.h" #include <linux/module.h>
#include "asm/param.h" #include <linux/kernel.h>
#include <linux/delay.h>
#include <asm/param.h>
void __delay(unsigned long time) void __delay(unsigned long time)
{ {
@ -20,13 +22,19 @@ void __udelay(unsigned long usecs)
int i, n; int i, n;
n = (loops_per_jiffy * HZ * usecs) / MILLION; n = (loops_per_jiffy * HZ * usecs) / MILLION;
for(i=0;i<n;i++) ; for(i=0;i<n;i++)
cpu_relax();
} }
EXPORT_SYMBOL(__udelay);
void __const_udelay(unsigned long usecs) void __const_udelay(unsigned long usecs)
{ {
int i, n; int i, n;
n = (loops_per_jiffy * HZ * usecs) / MILLION; n = (loops_per_jiffy * HZ * usecs) / MILLION;
for(i=0;i<n;i++) ; for(i=0;i<n;i++)
cpu_relax();
} }
EXPORT_SYMBOL(__const_udelay);

View File

@ -5,40 +5,37 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/delay.h" #include <linux/module.h>
#include "asm/processor.h" #include <linux/delay.h>
#include "asm/param.h" #include <asm/processor.h>
#include <asm/param.h>
void __delay(unsigned long loops) void __delay(unsigned long loops)
{ {
unsigned long i; unsigned long i;
for(i = 0; i < loops; i++) ; for(i = 0; i < loops; i++)
cpu_relax();
} }
void __udelay(unsigned long usecs) void __udelay(unsigned long usecs)
{ {
int i, n; unsigned long i, n;
n = (loops_per_jiffy * HZ * usecs) / MILLION; n = (loops_per_jiffy * HZ * usecs) / MILLION;
for(i=0;i<n;i++) ; for(i=0;i<n;i++)
cpu_relax();
} }
EXPORT_SYMBOL(__udelay);
void __const_udelay(unsigned long usecs) void __const_udelay(unsigned long usecs)
{ {
int i, n; unsigned long i, n;
n = (loops_per_jiffy * HZ * usecs) / MILLION; n = (loops_per_jiffy * HZ * usecs) / MILLION;
for(i=0;i<n;i++) ; for(i=0;i<n;i++)
cpu_relax();
} }
/* EXPORT_SYMBOL(__const_udelay);
* 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:
*/