diff mbox

next-20130624 build fix for imx_v6_v7_defconfig

Message ID 1421252.HsQN8mblgM@amdc1032 (mailing list archive)
State New, archived
Headers show

Commit Message

Bartlomiej Zolnierkiewicz June 24, 2013, 6:10 p.m. UTC
Hi,

The issue is probably caused by:

commit 38ff87f77af0b5a93fc8581cff1d6e5692ab8970
Author: Stephen Boyd <sboyd@codeaurora.org>
Date:   Sat Jun 1 23:39:40 2013 -0700

    sched_clock: Make ARM's sched_clock generic for all architectures
...

not taking into account following change:

commit c19672492d233e0012b60fbfa460ffac1381ee26
Author: Jingchang Lu <b35083@freescale.com>
Date:   Wed May 29 10:12:17 2013 +0200

    clocksource: Add Freescale Vybrid pit timer support
...

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

---

Comments

Stephen Rothwell June 25, 2013, 12:30 a.m. UTC | #1
Hi,

On Mon, 24 Jun 2013 20:10:19 +0200 Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> wrote:
>
> The issue is probably caused by:
> 
> commit 38ff87f77af0b5a93fc8581cff1d6e5692ab8970
> Author: Stephen Boyd <sboyd@codeaurora.org>
> Date:   Sat Jun 1 23:39:40 2013 -0700
> 
>     sched_clock: Make ARM's sched_clock generic for all architectures
> ...
> 
> not taking into account following change:
> 
> commit c19672492d233e0012b60fbfa460ffac1381ee26
> Author: Jingchang Lu <b35083@freescale.com>
> Date:   Wed May 29 10:12:17 2013 +0200
> 
>     clocksource: Add Freescale Vybrid pit timer support

Both those commits are in the tip tree so this fix is needed there (cc's
added).

> ...
> 
> Best regards,
> --
> Bartlomiej Zolnierkiewicz
> Samsung R&D Institute Poland
> Samsung Electronics
> 
> ---
> 
> Index: b/drivers/clocksource/vf_pit_timer.c
> ===================================================================
> --- a/drivers/clocksource/vf_pit_timer.c	2013-06-24 19:41:07.022518558 +0200
> +++ b/drivers/clocksource/vf_pit_timer.c	2013-06-24 19:41:13.274518546 +0200
> @@ -12,7 +12,7 @@
>  #include <linux/clk.h>
>  #include <linux/of_address.h>
>  #include <linux/of_irq.h>
> -#include <asm/sched_clock.h>
> +#include <linux/sched_clock.h>
>  
>  /*
>   * Each pit takes 0x10 Bytes register space
> 
>
Fabio Estevam June 25, 2013, 12:33 a.m. UTC | #2
On Mon, Jun 24, 2013 at 9:30 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Both those commits are in the tip tree so this fix is needed there (cc's
> added).

Just fixed it:
http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?id=2699339361a9bacb3fa663e6b8981a040cfca4ee
diff mbox

Patch

Index: b/drivers/clocksource/vf_pit_timer.c
===================================================================
--- a/drivers/clocksource/vf_pit_timer.c	2013-06-24 19:41:07.022518558 +0200
+++ b/drivers/clocksource/vf_pit_timer.c	2013-06-24 19:41:13.274518546 +0200
@@ -12,7 +12,7 @@ 
 #include <linux/clk.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <asm/sched_clock.h>
+#include <linux/sched_clock.h>
 
 /*
  * Each pit takes 0x10 Bytes register space