Messages in this thread | | | Date | Sun, 20 Sep 2009 10:05:23 -0700 (PDT) | From | Linus Torvalds <> | Subject | Re: [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
| |