linux-kernel - Re: [GIT pull] timers/timekeeping for 2.6.32

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.LFD.2.01.0909201004560.4950@localhost.localdomain>
Date:	Sun, 20 Sep 2009 10:05:23 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Ingo Molnar <mingo@...e.hu>
cc:	Thomas Gleixner <tglx@...utronix.de>,
	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/