From patchwork Fri Apr 3 02:59:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baker X-Patchwork-Id: 6153361 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9A89ABF4A6 for ; Fri, 3 Apr 2015 03:04:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A604E203AA for ; Fri, 3 Apr 2015 03:04:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2794203A9 for ; Fri, 3 Apr 2015 03:04:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdrqJ-0000FC-RR; Fri, 03 Apr 2015 03:00:23 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdrqD-0007TG-At for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 03:00:18 +0000 Received: by wiaa2 with SMTP id a2so126086470wia.0 for ; Thu, 02 Apr 2015 19:59:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=9/dx/fAQq7JpLL0HGARKK5orm3eIlnLS46ZsrpQiJ7c=; b=ho9EpbIetMjKStHFspUGQ+4TFYRLVyuSqRDyP6lHxybV4tzqzIJ0JvdAdYt0XpXBtf S2xJ1gR7l2su19z2h0vdb5JWv5KTFmIZ9x6uSi19ukX4476reJupM5xCMjLB+NdZo2v2 QaNJGNjjArQkCY1YxXesot+27uQg4GSdJvPnLKapumUdpbP831mY9W4LTG5z1Wp7pF6P Clnv++6Y6YCxu94M8RtvCLzTQtngpsgSlkIEm4KplaEdjGz0DHc9TV62F1UKmkLlyVEl Htkjwl2yEAknzNIgbfRTFLz3GcbEJUxN30YX+/TEOg4P9pIj+2uZrnwJJrxjbGfRunsi Lnxw== X-Gm-Message-State: ALoCoQlv1PoDEJEyQTY40CQQWIcpXFb10oLuIoDqFveHgU+F/uB/Kg2aw6Q+qQkGCfr4ovrrexCR MIME-Version: 1.0 X-Received: by 10.194.193.69 with SMTP id hm5mr611338wjc.43.1428029993481; Thu, 02 Apr 2015 19:59:53 -0700 (PDT) Received: by 10.27.231.6 with HTTP; Thu, 2 Apr 2015 19:59:53 -0700 (PDT) In-Reply-To: <20150402082917.GS23123@twins.programming.kicks-ass.net> References: <2720045.6sPXjyyvfF@vostro.rjw.lan> <2863807.lxHPvZ2AsE@vostro.rjw.lan> <20150402082917.GS23123@twins.programming.kicks-ass.net> Date: Thu, 2 Apr 2015 19:59:53 -0700 Message-ID: Subject: Re: Build regression in next-20150331 From: Tyler Baker To: Peter Zijlstra X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150402_200017_532491_8285F653 X-CRM114-Status: GOOD ( 17.72 ) X-Spam-Score: -0.7 (/) Cc: Kevin Hilman , rafael.j.wysocki@intel.com, "Rafael J. Wysocki" , "linux-kernel@vger.kernel.org" , John Stultz , Thomas Gleixner , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 2 April 2015 at 01:29, Peter Zijlstra wrote: > On Wed, Apr 01, 2015 at 11:46:10PM +0200, Rafael J. Wysocki wrote: > >> > > --- >> > > kernel/time/tick-internal.h | 2 ++ >> > > 1 file changed, 2 insertions(+) >> > > >> > > Index: linux-pm/kernel/time/tick-internal.h >> > > =================================================================== >> > > --- linux-pm.orig/kernel/time/tick-internal.h >> > > +++ linux-pm/kernel/time/tick-internal.h >> > > @@ -110,7 +110,9 @@ static inline int tick_broadcast_update_ >> > > /* Set the periodic handler in non broadcast mode */ >> > > static inline void tick_set_periodic_handler(struct clock_event_device *dev, int broadcast) >> > > { >> > > +#ifdef CONFIG_GENERIC_CLOCKEVENTS >> > > dev->event_handler = tick_handle_periodic; >> > > +#endif >> > > } >> > > #endif /* !BROADCAST */ > >> Peter, do you think the above is acceptable or do I need to do anything more >> sophisticated to fix this? [The alternative would be probably to prepare an >> empty definition of tick_handle_periodic() for CONFIG_GENERIC_CLOCKEVENTS and >> move the definition of struct clock_event_device from under that Kconfig >> option.] > > > Does not something like the below make more sense? The entire broadcast > thing doesn't make sense if we don't have generic_clockevents. > > Should we wrap more in generic_clockevents there? > > --- > kernel/time/tick-internal.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h > index 2a1563a..5569e65 100644 > --- a/kernel/time/tick-internal.h > +++ b/kernel/time/tick-internal.h > @@ -81,6 +81,7 @@ static inline int tick_check_oneshot_change(int allow_nohz) { return 0; } > #endif /* !TICK_ONESHOT */ > > /* Broadcasting support */ > +#ifdef CONFIG_GENERIC_CLOCKEVENTS > #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST > extern int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu); > extern void tick_install_broadcast_device(struct clock_event_device *dev); > @@ -114,6 +115,7 @@ static inline void tick_set_periodic_handler(struct clock_event_device *dev, int > dev->event_handler = tick_handle_periodic; > } > #endif /* !BROADCAST */ > +#endif /* GENERIC */ > > /* Functions related to oneshot broadcasting */ > #if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT) Tested-by: Tyler Baker Looks good to me. Applied on top of next-20150402[0]: Acked-by: Rafael J. Wysocki --- kernel/time/tick-internal.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) extern void tick_install_broadcast_device(struct clock_event_device *dev); @@ -114,7 +115,7 @@ static inline void tick_set_periodic_handler(struct clock_event_device *dev, int dev->event_handler = tick_handle_periodic; } #endif /* !BROADCAST */ +#endif /* GENERIC */ /* Functions related to oneshot broadcasting */ #if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT) extern void tick_broadcast_setup_oneshot(struct clock_event_device *bc); --- Tyler [0] http://kernelci.org/build/tbaker/kernel/v4.0-rc6-8742-g76c8cce3+gcc-linaro-4.9-2015.02/ diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index 2a1563a..e332bb4 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -81,6 +81,7 @@ static inline int tick_check_oneshot_change(int allow_nohz) { return 0; } #endif /* !TICK_ONESHOT */ /* Broadcasting support */ +#ifdef CONFIG_GENERIC_CLOCKEVENTS #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST extern int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu);