diff options
| author | kogiidena <kogiidena@eggplant.ddo.jp> | 2007-05-08 20:45:46 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@hera.kernel.org> | 2007-05-09 01:35:02 +0000 |
| commit | c71861e65e2898850478a7ac6c4b8cc9f7007e9e (patch) | |
| tree | 6ab615967bc5e6d2116b1b5cc3ffe945c5ae14b3 /arch/sh/lib | |
| parent | 074f98df0547b7d15f78db9a17e985da0c22af28 (diff) | |
| download | linux-3.10-c71861e65e2898850478a7ac6c4b8cc9f7007e9e.tar.gz linux-3.10-c71861e65e2898850478a7ac6c4b8cc9f7007e9e.tar.bz2 linux-3.10-c71861e65e2898850478a7ac6c4b8cc9f7007e9e.zip | |
sh: Fixup ndelay() xloops calculation for alternate HZ.
Currently the xloops calculation in ndelay() gets set to 0 when
calculated with HZ=250, fix up how we do the HZ factoring in order
to get this right for differing values.
Signed-off-by: kogiidena <kogiidena@eggplant.ddo.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/lib')
| -rw-r--r-- | arch/sh/lib/delay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/lib/delay.c b/arch/sh/lib/delay.c index 351714694d6..f3ddd2133e6 100644 --- a/arch/sh/lib/delay.c +++ b/arch/sh/lib/delay.c @@ -24,9 +24,10 @@ inline void __const_udelay(unsigned long xloops) __asm__("dmulu.l %0, %2\n\t" "sts mach, %0" : "=r" (xloops) - : "0" (xloops), "r" (cpu_data[raw_smp_processor_id()].loops_per_jiffy) + : "0" (xloops), + "r" (HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) : "macl", "mach"); - __delay(xloops * HZ); + __delay(xloops); } void __udelay(unsigned long usecs) |