From: John Stultz <john.stultz@linaro.org>
To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org,
jim.cromie@gmail.com, tglx@linutronix.de, mingo@elte.hu
Subject: Re: [tip:timers/core] clocksource: scx200_hrt: Fix the build
Date: Thu, 23 Feb 2012 16:28:45 -0800 [thread overview]
Message-ID: <1330043325.2340.290.camel@work-vm> (raw)
In-Reply-To: <tip-jceb26fns5w7tv8edlivhxpa@git.kernel.org>
On Wed, 2012-02-22 at 08:13 -0800, tip-bot for Ingo Molnar wrote:
> Commit-ID: 10ea9d6f5663c3ed51f91cd037b4b9b147273cbb
> Gitweb: http://git.kernel.org/tip/10ea9d6f5663c3ed51f91cd037b4b9b147273cbb
> Author: Ingo Molnar <mingo@elte.hu>
> AuthorDate: Wed, 22 Feb 2012 13:19:37 +0100
> Committer: Ingo Molnar <mingo@elte.hu>
> CommitDate: Wed, 22 Feb 2012 13:25:16 +0100
>
> clocksource: scx200_hrt: Fix the build
>
> This commit:
>
> 12d6d41276de: clocksource: scx200_hrt: Convert scx200 to use clocksource_register_hz
>
> Breaks the build on x86-32:
>
> drivers/clocksource/scx200_hrt.c: In function ‘init_hrt_clocksource’:
> drivers/clocksource/scx200_hrt.c:95:0: error: unterminated argument list invoking macro "pr_info"
> drivers/clocksource/scx200_hrt.c:84:2: error: ‘pr_info’ undeclared (first use in this function)
>
> It could not possibly have been build tested, because it had this mismerge:
>
> pr_info("enabling scx200 high-res timer (%s MHz +%d ppm)\n",
> printk(KERN_INFO "enabling scx200 high-res timer (%s MHz +%d ppm)\n",
> mhz27 ? "27":"1", ppm);
Yea, looking in my git logs, that was me. Sorry about that.
Thanks for catching it and fixing it up.
-john
prev parent reply other threads:[~2012-02-24 0:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 16:13 [tip:timers/core] clocksource: scx200_hrt: Fix the build tip-bot for Ingo Molnar
2012-02-24 0:28 ` John Stultz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330043325.2340.290.camel@work-vm \
--to=john.stultz@linaro.org \
--cc=hpa@zytor.com \
--cc=jim.cromie@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).