[tip:timers/core] clocksource: scx200_hrt: Fix the build

[tip:timers/core] clocksource: scx200_hrt: Fix the build

[tip-bot for Ingo Molnar]

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);
 }

Re: [tip:timers/core] clocksource: scx200_hrt: Fix the build

[John Stultz]

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