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: 46740 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 67343215A9 for ; Fri, 3 Apr 2015 03:00:06 +0000 (UTC) Received: by lbdc10 with SMTP id c10sf21011570lbd.0 for ; Thu, 02 Apr 2015 20:00:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :date:message-id:subject:from:to:cc:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=DUw5B9sEU12ecuQJNycp8w2sWp2HMP2UjN1gEaVjAbc=; b=a5+n2gU7E/KvmNv1PKUUqvoPvuqhQgd1cOAhnTePykjBYKwnPZtRi5oekxOLDH1BEN uG2c2ygM9cVJ/pbJkRZN8oWiIiSHuYvdd59Cilfwu3n+wRCqf/FDECl/TyD9UldnKXTJ G14qEb/JOgALP4lFP15Rw6RgCP4+rzIWqQltQHydRYIoiIyvd6cJUyPeIiLsrtQB0D90 iw+dfU55DORvDia3/41sXKL1kmq3cV5Wm7eR4CQ9tFd181QeH9Kf8sgQic8jvcK1BSmr 21VH3XSUGyrNn345G/I/I1u4fqRuiC2P6KCIqVRwuFRYvBOn1lCJTuuWN1fSEWcGOhrx 1IVA== X-Gm-Message-State: ALoCoQnokXtT3IDhrLXS/fVnX0cnSYTCrIHZw1cADhc/cxMXwUdeYgP7UA1lZiUPOmiEGTSa3KXI X-Received: by 10.180.88.196 with SMTP id bi4mr3812830wib.5.1428030005312; Thu, 02 Apr 2015 20:00:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.36 with SMTP id n4ls242333laj.27.gmail; Thu, 02 Apr 2015 20:00:05 -0700 (PDT) X-Received: by 10.152.182.167 with SMTP id ef7mr296434lac.109.1428030005049; Thu, 02 Apr 2015 20:00:05 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id 6si5667069lal.25.2015.04.02.20.00.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Apr 2015 20:00:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lagg8 with SMTP id g8so72665928lag.1 for ; Thu, 02 Apr 2015 20:00:04 -0700 (PDT) X-Received: by 10.112.8.101 with SMTP id q5mr311073lba.19.1428030004906; Thu, 02 Apr 2015 20:00:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp1704762lbq; Thu, 2 Apr 2015 20:00:03 -0700 (PDT) X-Received: by 10.66.221.135 with SMTP id qe7mr566857pac.97.1428030002374; Thu, 02 Apr 2015 20:00:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gl2si2291531pbb.68.2015.04.02.20.00.01; Thu, 02 Apr 2015 20:00:02 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753432AbbDCC75 (ORCPT + 27 others); Thu, 2 Apr 2015 22:59:57 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:33847 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751153AbbDCC7y (ORCPT ); Thu, 2 Apr 2015 22:59:54 -0400 Received: by wgbdm7 with SMTP id dm7so101276237wgb.1 for ; Thu, 02 Apr 2015 19:59:53 -0700 (PDT) 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 Cc: "Rafael J. Wysocki" , Thomas Gleixner , rafael.j.wysocki@intel.com, John Stultz , "linux-kernel@vger.kernel.org" , linux-arm-kernel , Kevin Hilman Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tyler.baker@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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]: --- 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/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ 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);