Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186468
b: refs/heads/master
c: c601852
h: refs/heads/master
v: v3
  • Loading branch information
john stultz authored and Kyle McMartin committed Mar 6, 2010
1 parent 83eaf97 commit efd52f0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eef83afbd6c2577c9fd07e1a280bb0beb603b293
refs/heads/master: c60185248fd1c7b777f08d3f3337836331da3d17
29 changes: 13 additions & 16 deletions trunk/arch/parisc/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,21 @@ static int __init rtc_init(void)
}
module_init(rtc_init);

void __init time_init(void)
void read_persistent_clock(struct timespec *ts)
{
static struct pdc_tod tod_data;
if (pdc_tod_read(&tod_data) == 0) {
ts->tv_sec = tod_data.tod_sec;
ts->tv_nsec = tod_data.tod_usec * 1000;
} else {
printk(KERN_ERR "Error reading tod clock\n");
ts->tv_sec = 0;
ts->tv_nsec = 0;
}
}

void __init time_init(void)
{
unsigned long current_cr16_khz;

clocktick = (100 * PAGE0->mem_10msec) / HZ;
Expand All @@ -264,19 +276,4 @@ void __init time_init(void)
clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz,
clocksource_cr16.shift);
clocksource_register(&clocksource_cr16);

if (pdc_tod_read(&tod_data) == 0) {
unsigned long flags;

write_seqlock_irqsave(&xtime_lock, flags);
xtime.tv_sec = tod_data.tod_sec;
xtime.tv_nsec = tod_data.tod_usec * 1000;
set_normalized_timespec(&wall_to_monotonic,
-xtime.tv_sec, -xtime.tv_nsec);
write_sequnlock_irqrestore(&xtime_lock, flags);
} else {
printk(KERN_ERR "Error reading tod clock\n");
xtime.tv_sec = 0;
xtime.tv_nsec = 0;
}
}

0 comments on commit efd52f0

Please sign in to comment.