diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 01:47:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 01:47:10 -0400 |
| commit | 949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch) | |
| tree | ca88fd8f8f81b167dc4685ed34e9636f267db60d /arch/um/sys-i386/delay.c | |
| parent | b095518ef51c37658c58367bd19240b8a113f25c (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
| download | linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.gz linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.bz2 linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.zip | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'arch/um/sys-i386/delay.c')
| -rw-r--r-- | arch/um/sys-i386/delay.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/um/sys-i386/delay.c b/arch/um/sys-i386/delay.c index e9892eef51ce..2c11b9770e8b 100644 --- a/arch/um/sys-i386/delay.c +++ b/arch/um/sys-i386/delay.c @@ -1,5 +1,7 @@ -#include "linux/delay.h" -#include "asm/param.h" +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/delay.h> +#include <asm/param.h> void __delay(unsigned long time) { @@ -20,13 +22,19 @@ void __udelay(unsigned long usecs) int i, n; 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) { int i, n; 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); |