* [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h @ 2013-10-03 19:49 Stephen Boyd 2013-10-03 19:49 ` [PATCH 2/2] ARM: Remove temporary sched_clock.h header Stephen Boyd 2013-10-11 21:53 ` [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h Kevin Hilman 0 siblings, 2 replies; 3+ messages in thread From: Stephen Boyd @ 2013-10-03 19:49 UTC (permalink / raw) To: linux-arm-kernel The sched_clock.h include is under include/linux now. Cc: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- 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> -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: Remove temporary sched_clock.h header 2013-10-03 19:49 [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h Stephen Boyd @ 2013-10-03 19:49 ` Stephen Boyd 2013-10-11 21:53 ` [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h Kevin Hilman 1 sibling, 0 replies; 3+ messages in thread From: Stephen Boyd @ 2013-10-03 19:49 UTC (permalink / raw) To: linux-arm-kernel This header file is no longer needed now that the ARM sched_clock framework is generic and all users have moved to linux/sched_clock.h instead of asm/sched_clock.h. Remove it. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/include/asm/sched_clock.h | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 arch/arm/include/asm/sched_clock.h diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h deleted file mode 100644 index 2389b71..0000000 --- a/arch/arm/include/asm/sched_clock.h +++ /dev/null @@ -1,4 +0,0 @@ -/* You shouldn't include this file. Use linux/sched_clock.h instead. - * Temporary file until all asm/sched_clock.h users are gone - */ -#include <linux/sched_clock.h> -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h 2013-10-03 19:49 [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h Stephen Boyd 2013-10-03 19:49 ` [PATCH 2/2] ARM: Remove temporary sched_clock.h header Stephen Boyd @ 2013-10-11 21:53 ` Kevin Hilman 1 sibling, 0 replies; 3+ messages in thread From: Kevin Hilman @ 2013-10-11 21:53 UTC (permalink / raw) To: linux-arm-kernel Hi Stephen, Stephen Boyd <sboyd@codeaurora.org> writes: > The sched_clock.h include is under include/linux now. > > Cc: Alexander Shiyan <shc_work@mail.ru> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> I applied both of these to next/cleanup. Thanks, Kevin ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-11 21:53 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-10-03 19:49 [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h Stephen Boyd 2013-10-03 19:49 ` [PATCH 2/2] ARM: Remove temporary sched_clock.h header Stephen Boyd 2013-10-11 21:53 ` [PATCH 1/2] ARM: clps711x: Use linux/sched_clock.h Kevin Hilman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).