From patchwork Wed Dec 23 04:15:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 69458 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBN4FEmK022014 for ; Wed, 23 Dec 2009 04:15:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753120AbZLWEPN (ORCPT ); Tue, 22 Dec 2009 23:15:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753088AbZLWEPM (ORCPT ); Tue, 22 Dec 2009 23:15:12 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:51207 "EHLO e31.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752579AbZLWEPK (ORCPT ); Tue, 22 Dec 2009 23:15:10 -0500 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e31.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id nBN47TEj020607; Tue, 22 Dec 2009 21:07:29 -0700 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nBN4F7WN129566; Tue, 22 Dec 2009 21:15:07 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nBN4F652001276; Tue, 22 Dec 2009 21:15:07 -0700 Received: from [9.65.31.230] (sig-9-65-31-230.mts.ibm.com [9.65.31.230]) by d03av01.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id nBN4F58j001211; Tue, 22 Dec 2009 21:15:06 -0700 Subject: [RFC][PATCH 13/14] Convert sh to read/update_persistent_clock From: john stultz To: lkml Cc: Paul Mundt , linux-sh@vger.kernel.org In-Reply-To: <1261541643.3508.74.camel@localhost.localdomain> References: <1261540762.3508.61.camel@localhost.localdomain> <1261540826.3508.62.camel@localhost.localdomain> <1261540902.3508.63.camel@localhost.localdomain> <1261540988.3508.64.camel@localhost.localdomain> <1261541054.3508.65.camel@localhost.localdomain> <1261541130.3508.66.camel@localhost.localdomain> <1261541188.3508.67.camel@localhost.localdomain> <1261541286.3508.69.camel@localhost.localdomain> <1261541342.3508.70.camel@localhost.localdomain> <1261541415.3508.71.camel@localhost.localdomain> <1261541491.3508.72.camel@localhost.localdomain> <1261541567.3508.73.camel@localhost.localdomain> <1261541643.3508.74.camel@localhost.localdomain> Date: Tue, 22 Dec 2009 20:15:03 -0800 Message-ID: <1261541703.3508.75.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Index: gettimeoffset/arch/sh/kernel/time.c =================================================================== --- gettimeoffset.orig/arch/sh/kernel/time.c 2009-12-22 18:50:55.000000000 -0800 +++ gettimeoffset/arch/sh/kernel/time.c 2009-12-22 18:51:12.000000000 -0800 @@ -39,12 +39,12 @@ static int null_rtc_set_time(const time_ void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time; int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time; -#ifdef CONFIG_GENERIC_CMOS_UPDATE void read_persistent_clock(struct timespec *ts) { rtc_sh_get_time(ts); } +#ifdef CONFIG_GENERIC_CMOS_UPDATE int update_persistent_clock(struct timespec now) { return rtc_sh_set_time(now.tv_sec); @@ -113,9 +113,5 @@ void __init time_init(void) hwblk_init(); clk_init(); - rtc_sh_get_time(&xtime); - set_normalized_timespec(&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); - late_time_init = sh_late_time_init; }