From mboxrd@z Thu Jan 1 00:00:00 1970 From: john.stultz@linaro.org (John Stultz) Date: Mon, 24 Jun 2013 15:54:52 -0700 Subject: [PATCHv2 3/6] sched_clock: Make ARM's sched_clock generic for all architectures In-Reply-To: <51C8CC20.3010700@codeaurora.org> References: <1370155183-31421-1-git-send-email-sboyd@codeaurora.org> <1370155183-31421-4-git-send-email-sboyd@codeaurora.org> <201306211745.57528.arnd@arndb.de> <20130621170523.GA14575@codeaurora.org> <51C49072.1060700@linaro.org> <51C8CC20.3010700@codeaurora.org> Message-ID: <51C8CE3C.2030406@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 06/24/2013 03:45 PM, Stephen Boyd wrote: > On 06/21/13 10:42, John Stultz wrote: >> On 06/21/2013 10:05 AM, Stephen Boyd wrote: >>> On 06/21, Arnd Bergmann wrote: >>>> This causes build failures when doing a simple merge with the arm-soc >>>> tree: >>>> >>>> ==> build/clps711x_defconfig/faillog <== >>>> /git/arm-soc/arch/arm/mach-clps711x/common.c:37:29: fatal error: >>>> asm/sched_clock.h: No such file or directory >>>> #include >>>> ^ >>>> ==> build/imx_v6_v7_defconfig/faillog <== >>>> /git/arm-soc/drivers/clocksource/vf_pit_timer.c:15:29: fatal error: >>>> asm/sched_clock.h: No such file or directory >>>> #include >>>> >>>> How about adding back a temporary arch/arm/include/asm/sched_clock.h >>>> that only contains "#include " so we can change >>>> those two files after the merge and still get a bisectible history? >>>> >>> Sounds fine. John can you add this patch on top? >> Thanks. I've queued this and will send it on to Thomas here shortly. > Thanks John. Can you send this off to the tip tree? I think we'll need > to merge tip/timers into arm-soc so I can send the rest of my "kill ARM > local timer API" series through and this patch helps make that more > palatable. Thanks for the reminder! Just sent the pull request. thanks -john