Re: [PATCH] ARM: mach-clps711x: common: Use linux/sched_clock.h

From: Stephen Boyd
Date: Mon Jun 24 2013 - 20:37:19 EST


On 06/24/13 17:03, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
>
> Commit 38ff87f7 (sched_clock: Make ARM's sched_clock generic for all
> architectures) changed the header to <linux/sched_clock.h>, so adapt it in order
> to fix the following build error:
>
> arch/arm/mach-clps711x/common.c:37:29: fatal error: asm/sched_clock.h: No such file or directory
>
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
> ---

Is this one in the arm-soc tree? I plan to make a sweep after 3.11-rc1
and fix up all the stragglers (looks like just this one) and remove the
dummy asm header that just got merged into the tip tree.

> arch/arm/mach-clps711x/common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
> index 4ca2f3c..134641d 100644
> --- a/arch/arm/mach-clps711x/common.c
> +++ b/arch/arm/mach-clps711x/common.c
> @@ -29,12 +29,12 @@
> #include <linux/clockchips.h>
> #include <linux/clocksource.h>
> #include <linux/clk-provider.h>
> +#include <linux/sched_clock.h>
>
> #include <asm/exception.h>
> #include <asm/mach/irq.h>
> #include <asm/mach/map.h>
> #include <asm/mach/time.h>
> -#include <asm/sched_clock.h>
> #include <asm/system_misc.h>
>
> #include <mach/hardware.h>


--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

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