git.openpandora.org
/
pandora-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-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
blackfin
/
kernel
/
time-ts.c
diff --git
a/arch/blackfin/kernel/time-ts.c
b/arch/blackfin/kernel/time-ts.c
index
cb7a01d
..
8c9a43d
100644
(file)
--- a/
arch/blackfin/kernel/time-ts.c
+++ b/
arch/blackfin/kernel/time-ts.c
@@
-353,9
+353,15
@@
void bfin_coretmr_clockevent_init(void)
#endif /* CONFIG_TICKSOURCE_CORETMR */
#endif /* CONFIG_TICKSOURCE_CORETMR */
-void
__init time_init(void
)
+void
read_persistent_clock(struct timespec *ts
)
{
time_t secs_since_1970 = (365 * 37 + 9) * 24 * 60 * 60; /* 1 Jan 2007 */
{
time_t secs_since_1970 = (365 * 37 + 9) * 24 * 60 * 60; /* 1 Jan 2007 */
+ ts->tv_sec = secs_since_1970;
+ ts->tv_nsec = 0;
+}
+
+void __init time_init(void)
+{
#ifdef CONFIG_RTC_DRV_BFIN
/* [#2663] hack to filter junk RTC values that would cause
#ifdef CONFIG_RTC_DRV_BFIN
/* [#2663] hack to filter junk RTC values that would cause
@@
-368,11
+374,6
@@
void __init time_init(void)
}
#endif
}
#endif
- /* Initialize xtime. From now on, xtime is updated with timer interrupts */
- xtime.tv_sec = secs_since_1970;
- xtime.tv_nsec = 0;
- set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);
-
bfin_cs_cycles_init();
bfin_cs_gptimer0_init();
bfin_cs_cycles_init();
bfin_cs_gptimer0_init();