From: Stephen Boyd Date: Fri, 21 Jun 2013 17:05:24 +0000 (-0700) Subject: sched_clock: Add temporary asm/sched_clock.h X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=629a6a2b7762a474177d08043bea094dd27e0a54;p=linux-beck.git 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 Signed-off-by: John Stultz --- 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