From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423486Ab3FURF2 (ORCPT ); Fri, 21 Jun 2013 13:05:28 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:49579 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423404Ab3FURF0 (ORCPT ); Fri, 21 Jun 2013 13:05:26 -0400 Date: Fri, 21 Jun 2013 10:05:24 -0700 From: Stephen Boyd To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, Russell King , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , arm@kernel.org, John Stultz , Catalin Marinas , Thomas Gleixner Subject: Re: [PATCHv2 3/6] sched_clock: Make ARM's sched_clock generic for all architectures Message-ID: <20130621170523.GA14575@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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201306211745.57528.arnd@arndb.de> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? ----8<----- Subject: [PATCH] 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 --- arch/arm/include/asm/sched_clock.h | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 arch/arm/include/asm/sched_clock.h 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 -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation