* [PATCH] ARM: mach-clps711x: common: Use linux/sched_clock.h
@ 2013-06-25 0:03 Fabio Estevam
2013-06-25 0:37 ` Stephen Boyd
0 siblings, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2013-06-25 0:03 UTC (permalink / raw)
To: john.stultz; +Cc: tglx, shc_work, linux-kernel, sboyd, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
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@freescale.com>
---
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>
--
1.8.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: mach-clps711x: common: Use linux/sched_clock.h
2013-06-25 0:03 [PATCH] ARM: mach-clps711x: common: Use linux/sched_clock.h Fabio Estevam
@ 2013-06-25 0:37 ` Stephen Boyd
2013-06-25 2:44 ` Fabio Estevam
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Boyd @ 2013-06-25 0:37 UTC (permalink / raw)
To: Fabio Estevam; +Cc: john.stultz, tglx, shc_work, linux-kernel, Fabio Estevam
On 06/24/13 17:03, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> 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@freescale.com>
> ---
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: mach-clps711x: common: Use linux/sched_clock.h
2013-06-25 0:37 ` Stephen Boyd
@ 2013-06-25 2:44 ` Fabio Estevam
2013-06-25 16:53 ` Stephen Boyd
0 siblings, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2013-06-25 2:44 UTC (permalink / raw)
To: Stephen Boyd; +Cc: john.stultz, tglx, shc_work, linux-kernel, Fabio Estevam
On Mon, Jun 24, 2013 at 9:37 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> Is this one in the arm-soc tree? I plan to make a sweep after 3.11-rc1
I haven't see a fix for this in the linux-arm-kernel list.
> 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.
There was another one and Thomas has already applied it:
http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?id=2699339361a9bacb3fa663e6b8981a040cfca4ee
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: mach-clps711x: common: Use linux/sched_clock.h
2013-06-25 2:44 ` Fabio Estevam
@ 2013-06-25 16:53 ` Stephen Boyd
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Boyd @ 2013-06-25 16:53 UTC (permalink / raw)
To: Fabio Estevam; +Cc: john.stultz, tglx, shc_work, linux-kernel, Fabio Estevam
On 06/24/13 19:44, Fabio Estevam wrote:
> On Mon, Jun 24, 2013 at 9:37 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
>
>> Is this one in the arm-soc tree? I plan to make a sweep after 3.11-rc1
> I haven't see a fix for this in the linux-arm-kernel list.
http://article.gmane.org/gmane.linux.kernel/1513390 was posted a few
days ago and was merged to the tip tree just before your patch. That
patch looks good because that sched_clock user is going through timers/core.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-25 16:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-25 0:03 [PATCH] ARM: mach-clps711x: common: Use linux/sched_clock.h Fabio Estevam
2013-06-25 0:37 ` Stephen Boyd
2013-06-25 2:44 ` Fabio Estevam
2013-06-25 16:53 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox