Commit-ID: 629a6a2b7762a474177d08043bea094dd27e0a54 Gitweb: http://git.kernel.org/tip/629a6a2b7762a474177d08043bea094dd27e0a54 Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> AuthorDate: Fri, 21 Jun 2013 10:05:24 -0700 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Fri, 21 Jun 2013 10:17:44 -0700 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@xxxxxxxxxxxxxx> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> --- arch/arm/include/asm/sched_clock.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h new file mode 100644 index 0000000..2389b71 --- /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> -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|