git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/asoc' into topic/asoc
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
kernel
/
time_32.c
diff --git
a/arch/sh/kernel/time_32.c
b/arch/sh/kernel/time_32.c
index c34e1e0f9b025072e8fb056d727a61e652656193..1700d2465f6c289d3e5143264b301d3dc9415eb0 100644
(file)
--- a/
arch/sh/kernel/time_32.c
+++ b/
arch/sh/kernel/time_32.c
@@
-208,7
+208,7
@@
unsigned long long sched_clock(void)
if (!clocksource_sh.rating)
return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);
- cycles = clocksource_sh.read();
+ cycles = clocksource_sh.read(
&clocksource_sh
);
return cyc2ns(&clocksource_sh, cycles);
}
#endif