projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] x86-64: Auto compute __NR_syscall_max at compile time
[powerpc.git]
/
arch
/
x86_64
/
lib
/
delay.c
diff --git
a/arch/x86_64/lib/delay.c
b/arch/x86_64/lib/delay.c
index
b6cd3cc
..
2dbebd3
100644
(file)
--- a/
arch/x86_64/lib/delay.c
+++ b/
arch/x86_64/lib/delay.c
@@
-8,7
+8,6
@@
* depends wildly on alignment on many x86 processors.
*/
* depends wildly on alignment on many x86 processors.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/delay.h>
@@
-41,13
+40,13
@@
EXPORT_SYMBOL(__delay);
inline void __const_udelay(unsigned long xloops)
{
inline void __const_udelay(unsigned long xloops)
{
- __delay((
xloops * HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) >> 32
);
+ __delay((
(xloops * HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) >> 32) + 1
);
}
EXPORT_SYMBOL(__const_udelay);
void __udelay(unsigned long usecs)
{
}
EXPORT_SYMBOL(__const_udelay);
void __udelay(unsigned long usecs)
{
- __const_udelay(usecs * 0x000010c
6); /* 2**32 / 1000000
*/
+ __const_udelay(usecs * 0x000010c
7); /* 2**32 / 1000000 (rounded up)
*/
}
EXPORT_SYMBOL(__udelay);
}
EXPORT_SYMBOL(__udelay);