[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090409131556.07c8eed9.akpm@linux-foundation.org>
Date: Thu, 9 Apr 2009 13:15:56 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Krzysztof Halasa <khc@...waw.pl>
Cc: david-b@...bell.net, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] fix RTC-CMOS message, now with SOB
On Sat, 04 Apr 2009 21:32:27 +0200
Krzysztof Halasa <khc@...waw.pl> wrote:
> + (cmos_rtc.mon_alrm ? "alarms up to one year" :
> + cmos_rtc.day_alrm ? "alarms up to one month" :
> + "alarms up to one day") :
> + "no alarms";
>
> Feel free to use the following or your own version as long as the
> resulting message is correct.
> Thanks.
>
> Signed-off-by: Krzysztof Ha__asa <khc@...waw.pl>
Please resend the full changelog (possibly with updates) with each
updated version of a patch.
> --- a/drivers/rtc/rtc-cmos.c
> +++ b/drivers/rtc/rtc-cmos.c
> @@ -794,17 +794,15 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
> goto cleanup2;
> }
>
> - pr_info("%s: alarms up to one %s%s, %zd bytes nvram%s\n",
> - cmos_rtc.rtc->dev.bus_id,
> - is_valid_irq(rtc_irq)
> - ? (cmos_rtc.mon_alrm
> - ? "year"
> - : (cmos_rtc.day_alrm
> - ? "month" : "day"))
> - : "no",
> - cmos_rtc.century ? ", y3k" : "",
> - nvram.size,
> - is_hpet_enabled() ? ", hpet irqs" : "");
> + pr_info("%s: %s%s, %zd bytes nvram%s\n",
> + cmos_rtc.rtc->dev.bus_id,
> + !is_valid_irq(rtc_irq) ? "no alarms" :
> + cmos_rtc.mon_alrm ? "alarms up to one year" :
> + cmos_rtc.day_alrm ? "alarms up to one month" :
> + "alarms up to one day",
> + cmos_rtc.century ? ", y3k" : "",
> + nvram.size,
> + is_hpet_enabled() ? ", hpet irqs" : "");
>
> return 0;
The patch doesn't apply to current kernels (the driver core guys have
been running rampant again, methinks). Please redo, retest, resend?
Thanks.
--
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/
Powered by blists - more mailing lists