]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
sched_clock: Add temporary asm/sched_clock.h
authorStephen Boyd <sboyd@codeaurora.org>
Fri, 21 Jun 2013 17:05:24 +0000 (10:05 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 21 Jun 2013 17:17:44 +0000 (10:17 -0700)
Some new users of the ARM sched_clock framework are going through
the arm-soc tree. Before 38ff87f (sched_clock: Make ARM's
sched_clock generic for all architectures, 2013-06-01) the header
file was in asm, but now it's in linux. One solution would be to
do an evil merge of the arm-soc tree and fix up the asm users,
but it's easier to add a temporary asm header that we can remove
along with the few stragglers after the merge window is over.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
arch/arm/include/asm/sched_clock.h [new file with mode: 0644]

diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h
new file mode 100644 (file)
index 0000000..2389b71
--- /dev/null
@@ -0,0 +1,4 @@
+/* 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>