lkml.org 
[lkml]   [2009]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT pull] timers/timekeeping for 2.6.32


On Sun, 20 Sep 2009, Ingo Molnar wrote:
>
> When pulling this you did a merge resolution to
> arch/mips/loongson/common/time.c in commit a03fdb761, but it looks
> suspicious:
>
> void read_persistent_clock(struct timespec *ts)
> {
> ts->tv_sec = return mc146818_get_cmos_time();
> ts->tv_nsec = 0;
> }
>
> that 'return' looks stray, so shouldnt we do the fix below?

Duh. Too much mousing around to cut-and-paste crap.

Linus


\
 
 \ /
  Last update: 2009-10-18 23:28    [W:0.099 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site