From: tip-bot for Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, john.stultz@linaro.org,
hpa@zytor.com, mingo@redhat.com, jim.cromie@gmail.com,
tglx@linutronix.de, mingo@elte.hu
Subject: [tip:timers/core] clocksource: scx200_hrt: Fix the build
Date: Wed, 22 Feb 2012 08:13:08 -0800 [thread overview]
Message-ID: <tip-jceb26fns5w7tv8edlivhxpa@git.kernel.org> (raw)
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);
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/n/tip-jceb26fns5w7tv8edlivhxpa@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
drivers/clocksource/scx200_hrt.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/clocksource/scx200_hrt.c b/drivers/clocksource/scx200_hrt.c
index 60db8b1..64f9e82 100644
--- a/drivers/clocksource/scx200_hrt.c
+++ b/drivers/clocksource/scx200_hrt.c
@@ -81,9 +81,7 @@ static int __init init_hrt_clocksource(void)
if (mhz27)
freq *= 27;
- 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);
+ pr_info("enabling scx200 high-res timer (%s MHz +%d ppm)\n", mhz27 ? "27":"1", ppm);
return clocksource_register_hz(&cs_hrt, freq);
}
next reply other threads:[~2012-02-22 16:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 16:13 tip-bot for Ingo Molnar [this message]
2012-02-24 0:28 ` [tip:timers/core] clocksource: scx200_hrt: Fix the build John Stultz
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=tip-jceb26fns5w7tv8edlivhxpa@git.kernel.org \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=jim.cromie@gmail.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--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).