From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759682Ab3BYOVY (ORCPT ); Mon, 25 Feb 2013 09:21:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38554 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758155Ab3BYOVX (ORCPT ); Mon, 25 Feb 2013 09:21:23 -0500 Message-ID: <512B7352.1040209@redhat.com> Date: Mon, 25 Feb 2013 09:21:06 -0500 From: Prarit Bhargava User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110419 Red Hat/3.1.10-1.el6_0 Thunderbird/3.1.10 MIME-Version: 1.0 To: Prarit Bhargava CC: linux-kernel@vger.kernel.org, John Stultz , Thomas Gleixner , x86@kernel.org Subject: Re: [PATCH] x86, clocksource, fix !CONFIG_CLOCKSOURCE_WATCHDOG compile References: <1361725480-22270-1-git-send-email-prarit@redhat.com> In-Reply-To: <1361725480-22270-1-git-send-email-prarit@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/24/2013 12:04 PM, Prarit Bhargava wrote: > On 02/22/2013 03:14 PM, Thomas Gleixner wrote: >>> +void clocksource_mark_unstable(struct clocksource *cs) { } >> >> Unless this is defined as >> >>> +static inline void clocksource_mark_unstable(struct clocksource *cs) { } >> >> Right? > > Whups. Of course ... new patch ... > > -----8<---- > > If I explicitly disable the clocksource watchdog in the x86 Kconfig, > the x86 kernel will not compile unless this is properly defined. > > Signed-off-by: Prarit Bhargava > Cc: John Stultz > Cc: Thomas Gleixner > Cc: x86@kernel.org > --- > kernel/time/clocksource.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c > index c958338..3d81a76 100644 > --- a/kernel/time/clocksource.c > +++ b/kernel/time/clocksource.c > @@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs) > static inline void clocksource_dequeue_watchdog(struct clocksource *cs) { } > static inline void clocksource_resume_watchdog(void) { } > static inline int clocksource_watchdog_kthread(void *data) { return 0; } > +static inline void clocksource_mark_unstable(struct clocksource *cs) { } > > #endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ Yuck. Self NACK this one ... sorry Thomas. I'm going to have to do more work on this patch ... P. >