ARM: mach-clps711x: common: Use linux/sched_clock.h
Subsystems (2)
PATCH 1/1 ARM: mach-clps711x: common: Use linux/sched_clock.h
From: Fabio Estevam <[email protected]>
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
--- arch/arm/mach-clps711x/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-clps711x/common.c +1 -1
@@ -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>
Signature · 1 line
1.8.1.2
Quoted 10 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Commit
38ff87f7(sched_clock: Make ARM'ssched_clockgeneric 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 directorySigned-off-by Fabio Estevam <[email protected]>---
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.
Quoted 21 lines
arch/arm/mach-clps711x/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-clps711x/common.c +1
-1@@ -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>
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 1 line · Stephen Boyd
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.
Quoted 2 lines
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
Quoted 4 lines · Fabio Estevam
Quoted 1 line · Stephen Boyd
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.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation