OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[android-x86/kernel.git]
/
arch
/
mips
/
loongson
/
common
/
time.c
diff --git
a/arch/mips/loongson/common/time.c
b/arch/mips/loongson/common/time.c
index
b13d171
..
0edbef3
100644
(file)
--- a/
arch/mips/loongson/common/time.c
+++ b/
arch/mips/loongson/common/time.c
@@
-21,7
+21,8
@@
void __init plat_time_init(void)
mips_hpt_frequency = cpu_clock_freq / 2;
}
-
unsigned long read_persistent_clock(void
)
+
void read_persistent_clock(struct timespec *ts
)
{
- return mc146818_get_cmos_time();
+ ts->tv_sec = return mc146818_get_cmos_time();
+ ts->tv_nsec = 0;
}