Re: [GIT pull] timers/timekeeping for 2.6.32

[Ingo Molnar]

* Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:

> Linus,
> 
> Please pull the latest timers-for-linus git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-for-linus
> 
> The changes in arch/arm, m68knommu, mips, powerpc, s390, sh, x86 and
> xtensa are fixups due to API changes in the core code.

Linus,

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?

	Ingo

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

diff --git a/arch/mips/loongson/common/time.c b/arch/mips/loongson/common/time.c
index 0edbef3..6e08c82 100644
--- a/arch/mips/loongson/common/time.c
+++ b/arch/mips/loongson/common/time.c
@@ -23,6 +23,6 @@ void __init plat_time_init(void)
 
 void read_persistent_clock(struct timespec *ts)
 {
-	ts->tv_sec = return mc146818_get_cmos_time();
+	ts->tv_sec = mc146818_get_cmos_time();
 	ts->tv_nsec = 0;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/