Commit 3e5c1240 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds
Browse files

set_rtc_mmss: show warning message only once 

Occasionally the system gets into a state where the CMOS clock has gotten
slightly ahead of current time and the periodic update of RTC fails.  The
message is a nuisance and repeats spamming the log.

  See: http://www.ntp.org/ntpfaq/NTP-s-trbl-spec.htm#Q-LINUX-SET-RTC-MMSS



Rather than just removing the message, make it show only once and reduce
severity since it indicates a normal and non urgent condition.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 04c6862c

arch/alpha/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ set_rtc_mmss(unsigned long nowtime) 
		CMOS_WRITE(real_seconds,RTC_SECONDS);

		CMOS_WRITE(real_minutes,RTC_MINUTES);

	} else {

		printk(KERN_WARNING

		printk_once(KERN_NOTICE

		       "set_rtc_mmss: can't update from %d to %d\n",

		       cmos_minutes, real_minutes);

 		retval = -1;

arch/cris/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int set_rtc_mmss(unsigned long nowtime) 
		CMOS_WRITE(real_seconds,RTC_SECONDS);

		CMOS_WRITE(real_minutes,RTC_MINUTES);

	} else {

		printk(KERN_WARNING

		printk_once(KERN_NOTICE

		       "set_rtc_mmss: can't update from %d to %d\n",

		       cmos_minutes, real_minutes);

		retval = -1;

arch/mips/dec/time.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ int rtc_mips_set_mmss(unsigned long nowtime) 
		CMOS_WRITE(real_seconds, RTC_SECONDS);

		CMOS_WRITE(real_minutes, RTC_MINUTES);

	} else {

		printk(KERN_WARNING

		printk_once(KERN_NOTICE

		       "set_rtc_mmss: can't update from %d to %d\n",

		       cmos_minutes, real_minutes);

		retval = -1;

arch/mips/include/asm/mc146818-time.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime) 
		CMOS_WRITE(real_seconds, RTC_SECONDS);

		CMOS_WRITE(real_minutes, RTC_MINUTES);

	} else {

		printk(KERN_WARNING

		printk_once(KERN_NOTICE

		       "set_rtc_mmss: can't update from %d to %d\n",

		       cmos_minutes, real_minutes);

		retval = -1;

arch/mn10300/kernel/rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int set_rtc_mmss(unsigned long nowtime) 
		CMOS_WRITE(real_seconds, RTC_SECONDS);

		CMOS_WRITE(real_minutes, RTC_MINUTES);

	} else {

		printk(KERN_WARNING

		printk_once(KERN_NOTICE

		       "set_rtc_mmss: can't update from %d to %d\n",

		       cmos_minutes, real_minutes);

		retval = -1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE