From patchwork Thu Jul 11 01:53:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjarni Ingi Gislason X-Patchwork-Id: 2825970 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C391DC0AB2 for ; Thu, 11 Jul 2013 02:13:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E692220119 for ; Thu, 11 Jul 2013 02:13:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C60020113 for ; Thu, 11 Jul 2013 02:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755391Ab3GKCND (ORCPT ); Wed, 10 Jul 2013 22:13:03 -0400 Received: from fenja.rhi.hi.is ([130.208.165.103]:46363 "EHLO fenja.rhi.hi.is" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755229Ab3GKCNB (ORCPT ); Wed, 10 Jul 2013 22:13:01 -0400 Received: from smtp.hi.is (smtp.hi.is [130.208.165.149]) by fenja.rhi.hi.is (8.13.8/8.13.8) with ESMTP id r6B2Cwsj028602; Thu, 11 Jul 2013 02:12:58 GMT Received: from katla.rhi.hi.is (katla.rhi.hi.is [130.208.165.1]) by smtp.hi.is (8.14.4/8.14.4) with ESMTP id r6B2CvNm016851 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 11 Jul 2013 02:12:58 GMT Received: from katla.rhi.hi.is (localhost [127.0.0.1]) by katla.rhi.hi.is (8.14.4+Sun/8.14.4) with ESMTP id r6B1rGu3006017; Thu, 11 Jul 2013 01:53:16 GMT Received: (from bjarniig@localhost) by katla.rhi.hi.is (8.14.4+Sun/8.14.4/Submit) id r6B1rEZK006016; Thu, 11 Jul 2013 01:53:14 GMT Date: Thu, 11 Jul 2013 01:53:14 +0000 From: Bjarni Ingi Gislason To: Clemens Ladisch Cc: Michal Marek , linux-kbuild@vger.kernel.org, lkml , rtc-linux@googlegroups.com, Alessandro Zummo Subject: Re: 3.10.0-rc7: rtc_cmos.o: No linking because of missing CONFIG_HPET [PATCH] Message-ID: <20130711015314.GA6001@rhi.hi.is> References: <20130629204217.GA2589@rhi.hi.is> <51D14128.3040608@suse.cz> <51D14E78.7040309@ladisch.de> <20130702194947.GA4240@rhi.hi.is> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130702194947.GA4240@rhi.hi.is> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Tue, Jul 02, 2013 at 07:49:47PM +0000, Bjarni Ingi Gislason wrote: > On Mon, Jul 01, 2013 at 11:40:08AM +0200, Clemens Ladisch wrote: > > > On 29.6.2013 22:42, Bjarni Ingi Gislason wrote: > > >> The file "drivers/rtc/rtc_cmos.c" needs CONFIG_HPET to get linked. > > >> > > >> rtc-cmos.c:(.text+0x16f214): undefined reference to `hpet_rtc_interrupt' > > > > CONFIG_HPET enables drivers/char/hpet.c and nothing else; it does not > > affect the HPET RTC emulation. > > > > You are probably searching for CONFIG_HPET_EMULATE_RTC. > > > > Sorry. I selected (configured) "HPET_TIMER" to fix the compilation > and linking (which automatically includes HPET_EMULATE_RTC). > This patch fixes the linking error and comments out one unused fuction. --- rtc-cmos.c-original 2013-06-22 19:47:31.000000000 +0000 +++ rtc-cmos.c 2013-07-10 20:42:32.000000000 +0000 @@ -121,11 +121,12 @@ static inline int hpet_set_periodic_freq return 0; } -static inline int hpet_rtc_dropped_irq(void) -{ - return 0; -} - +/* Not used in this file, but mentioned in include-file + * static inline int hpet_rtc_dropped_irq(void) + * { + * return 0; + * } + */ static inline int hpet_rtc_timer_init(void) { return 0; @@ -700,6 +701,11 @@ cmos_do_probe(struct device *dev, struct if (is_valid_irq(rtc_irq)) { irq_handler_t rtc_cmos_int_handler; +/* if CONFIG_HPET_EMULATE_RTC is false, "is_hpet_enabled()" is defined to + * return zero (false). + */ + +#ifdef CONFIG_HPET_EMULATE_RTC if (is_hpet_enabled()) { int err; @@ -711,6 +717,7 @@ cmos_do_probe(struct device *dev, struct goto cleanup1; } } else +#endif /* CONFIG_HPET_EMULATE_RTC */ rtc_cmos_int_handler = cmos_interrupt; retval = request_irq(rtc_irq, rtc_cmos_int_handler,