* [PATCH 0/3] Cleanup sched_clock.h users
@ 2013-07-18 2:39 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2013-07-18 2:39 UTC (permalink / raw)
To: arm, John Stultz, Thomas Gleixner
Cc: linux-kernel, linux-arm-kernel, Arnd Bergmann
This patchset cleans up the last few stragglers using the sched_clock.h
header file in asm and removes the asm header.
A new one appeared in drivers/clocksource so I'm not sure who
wants to take that one.
Stephen Boyd (3):
clocksource: orion: Use linux/sched_clock.h
ARM: clps711x: Use linux/sched_clock.h
ARM: Remove temporary sched_clock.h header
arch/arm/include/asm/sched_clock.h | 4 ----
arch/arm/mach-clps711x/common.c | 2 +-
drivers/clocksource/time-orion.c | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 arch/arm/include/asm/sched_clock.h
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] clocksource: orion: Use linux/sched_clock.h
2013-07-18 2:39 ` Stephen Boyd
@ 2013-07-18 2:39 ` Stephen Boyd
-1 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2013-07-18 2:39 UTC (permalink / raw)
To: linux-arm-kernel
The sched_clock.h include is under include/linux now.
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clocksource/time-orion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c
index ecbeb68..9c7f018 100644
--- a/drivers/clocksource/time-orion.c
+++ b/drivers/clocksource/time-orion.c
@@ -19,7 +19,7 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/spinlock.h>
-#include <asm/sched_clock.h>
+#include <linux/sched_clock.h>
#define TIMER_CTRL 0x00
#define TIMER0_EN BIT(0)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 1/3] clocksource: orion: Use linux/sched_clock.h
@ 2013-07-18 2:39 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2013-07-18 2:39 UTC (permalink / raw)
To: John Stultz, Thomas Gleixner
Cc: linux-kernel, linux-arm-kernel, arm, Arnd Bergmann,
Sebastian Hesselbarth
The sched_clock.h include is under include/linux now.
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clocksource/time-orion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c
index ecbeb68..9c7f018 100644
--- a/drivers/clocksource/time-orion.c
+++ b/drivers/clocksource/time-orion.c
@@ -19,7 +19,7 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/spinlock.h>
-#include <asm/sched_clock.h>
+#include <linux/sched_clock.h>
#define TIMER_CTRL 0x00
#define TIMER0_EN BIT(0)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] ARM: clps711x: Use linux/sched_clock.h
2013-07-18 2:39 ` Stephen Boyd
@ 2013-07-18 2:39 ` Stephen Boyd
-1 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2013-07-18 2:39 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] 10+ messages in thread
* [PATCH 2/3] ARM: clps711x: Use linux/sched_clock.h
@ 2013-07-18 2:39 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2013-07-18 2:39 UTC (permalink / raw)
To: arm
Cc: linux-kernel, linux-arm-kernel, John Stultz, Thomas Gleixner,
Arnd Bergmann, Alexander Shiyan
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] 10+ messages in thread
* [PATCH 3/3] ARM: Remove temporary sched_clock.h header
2013-07-18 2:39 ` Stephen Boyd
@ 2013-07-18 2:39 ` Stephen Boyd
-1 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2013-07-18 2:39 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] 10+ messages in thread
* [PATCH 3/3] ARM: Remove temporary sched_clock.h header
@ 2013-07-18 2:39 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2013-07-18 2:39 UTC (permalink / raw)
To: arm
Cc: linux-kernel, linux-arm-kernel, John Stultz, Thomas Gleixner,
Arnd Bergmann
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] 10+ messages in thread
* [PATCH 0/3] Cleanup sched_clock.h users
2013-07-18 2:39 ` Stephen Boyd
@ 2013-07-18 3:41 ` John Stultz
-1 siblings, 0 replies; 10+ messages in thread
From: John Stultz @ 2013-07-18 3:41 UTC (permalink / raw)
To: linux-arm-kernel
On 07/17/2013 07:39 PM, Stephen Boyd wrote:
> This patchset cleans up the last few stragglers using the sched_clock.h
> header file in asm and removes the asm header.
>
> A new one appeared in drivers/clocksource so I'm not sure who
> wants to take that one.
Thanks for doing this!
I'll queue the drivers/clocksource one on its own in a separate branch,
that way I'll merge it into my own 3.12 queue, and Arnd/Olof can also
merge just that change it in before they drop the asm/sched_clock.h header.
I just pushed it out here:
git://git.linaro.org/people/jstultz/linux.git fortglx/3.12/sched-clock-cleanups
thanks
-john
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] Cleanup sched_clock.h users
@ 2013-07-18 3:41 ` John Stultz
0 siblings, 0 replies; 10+ messages in thread
From: John Stultz @ 2013-07-18 3:41 UTC (permalink / raw)
To: Stephen Boyd
Cc: arm, Thomas Gleixner, linux-kernel, linux-arm-kernel,
Arnd Bergmann, Olof Johansson
On 07/17/2013 07:39 PM, Stephen Boyd wrote:
> This patchset cleans up the last few stragglers using the sched_clock.h
> header file in asm and removes the asm header.
>
> A new one appeared in drivers/clocksource so I'm not sure who
> wants to take that one.
Thanks for doing this!
I'll queue the drivers/clocksource one on its own in a separate branch,
that way I'll merge it into my own 3.12 queue, and Arnd/Olof can also
merge just that change it in before they drop the asm/sched_clock.h header.
I just pushed it out here:
git://git.linaro.org/people/jstultz/linux.git fortglx/3.12/sched-clock-cleanups
thanks
-john
^ permalink raw reply [flat|nested] 10+ messages in thread