lkml.org 
[lkml]   [2012]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [tip:timers/core] clocksource: scx200_hrt: Fix the build
From
Date
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2012-02-24 01:33    [W:0.037 / U:0.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site