From patchwork Wed Feb 2 16:57:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Erickson X-Patchwork-Id: 527181 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p12K0VJR000416 for ; Wed, 2 Feb 2011 20:03:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754570Ab1BBQ5y (ORCPT ); Wed, 2 Feb 2011 11:57:54 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:38328 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754452Ab1BBQ5y (ORCPT ); Wed, 2 Feb 2011 11:57:54 -0500 Received: by iwn9 with SMTP id 9so160588iwn.19 for ; Wed, 02 Feb 2011 08:57:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:user-agent:date:subject:from:to:cc:message-id :thread-topic:thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=nlgk1rc4CaZk+MA6vaxUwCW9q8be64uWsExHvWoRkT8=; b=lTiXAQlmYKj6Ys6+jincQs0sRyvkpsjLggGHlY8J5iyW5hi10oJYJY67ZjzBdvk66B asdOJMny7lX7C94/udyKaKeTOuQ8BMw+F9n/QfE1I+SEU0UQRuxRFwaENaNREu4tR5PS s+iSBTuidCqEzcghZv2rCuoAfeyYdYpk+aQNY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; b=aymlBoH995Y3s+vt4NAyF0Sk3tGbswmQhQA61oKtQnwJpjG7ileE/oAwiDLsWeVlkG WtlOznW9jPBlUC5tR+jgEFfmhbtX1BKI9wJmXVuPDBHY/bI7ocVTgVgx8+2t8pyWoDe5 LgwTI04SgUnKa8trz4nmbHPrmB9x587/PeYgg= Received: by 10.42.179.133 with SMTP id bq5mr11439717icb.242.1296665873601; Wed, 02 Feb 2011 08:57:53 -0800 (PST) Received: from [10.2.10.52] (208.74.181.34.static.etheric.net [208.74.181.34]) by mx.google.com with ESMTPS id z4sm19959664ibg.1.2011.02.02.08.57.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Feb 2011 08:57:51 -0800 (PST) User-Agent: Microsoft-Entourage/12.28.0.101117 Date: Wed, 02 Feb 2011 08:57:46 -0800 Subject: Re: ARM Architecture and GENERIC_CMOS_UPDATE From: Grant Erickson To: Tony Lindgren CC: Message-ID: Thread-Topic: ARM Architecture and GENERIC_CMOS_UPDATE Thread-Index: AcvC+lCYCi3H0U8kbUmXpBTyeqk9mg== In-Reply-To: <20110201223252.GG3358@atomide.com> Mime-version: 1.0 Content-type: text/plain; charset="US-ASCII" Content-transfer-encoding: 7bit Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 02 Feb 2011 20:03:54 +0000 (UTC) --- a/linux/arch/arm/kernel/time.c +++ b/linux/arch/arm/kernel/time.c @@ -89,6 +89,9 @@ static unsigned long dummy_gettimeoffset(void) } #endif +#if defined(CONFIG_GENERIC_CMOS_UPDATE) +static inline void do_set_rtc(void) { return; } +#else /* !defined(CONFIG_GENERIC_CMOS_UPDATE) */ static unsigned long next_rtc_update; /* @@ -118,6 +121,7 @@ static inline void do_set_rtc(void) else next_rtc_update = xtime.tv_sec + 660; } +#endif /* defined(CONFIG_GENERIC_CMOS_UPDATE) */ #ifdef CONFIG_LEDS