diff options
| author | Stephen Boyd | 2013-06-21 19:05:24 +0200 |
|---|---|---|
| committer | John Stultz | 2013-06-21 19:17:44 +0200 |
| commit | 629a6a2b7762a474177d08043bea094dd27e0a54 (patch) | |
| tree | 1a4197865a73479df2841ea630194bae671bd7c5 /arch | |
| parent | Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific" (diff) | |
| download | kernel-qcow2-linux-629a6a2b7762a474177d08043bea094dd27e0a54.tar.gz kernel-qcow2-linux-629a6a2b7762a474177d08043bea094dd27e0a54.tar.xz kernel-qcow2-linux-629a6a2b7762a474177d08043bea094dd27e0a54.zip | |
sched_clock: Add temporary asm/sched_clock.h
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/sched_clock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h new file mode 100644 index 000000000000..2389b71a8e7c --- /dev/null +++ b/arch/arm/include/asm/sched_clock.h @@ -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> |