Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965490AbWJBWpJ (ORCPT ); Mon, 2 Oct 2006 18:45:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965491AbWJBWpJ (ORCPT ); Mon, 2 Oct 2006 18:45:09 -0400 Received: from smtp.osdl.org ([65.172.181.4]:7386 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S965490AbWJBWpG (ORCPT ); Mon, 2 Oct 2006 18:45:06 -0400 Date: Mon, 2 Oct 2006 15:44:32 -0700 From: Andrew Morton To: john stultz Cc: Thomas Gleixner , LKML , Ingo Molnar , Jim Gettys , David Woodhouse , Arjan van de Ven , Dave Jones Subject: Re: [patch 03/23] GTOD: persistent clock support, i386 Message-Id: <20061002154432.ed090fd9.akpm@osdl.org> In-Reply-To: <1159826617.27968.22.camel@localhost.localdomain> References: <20060929234435.330586000@cruncher.tec.linutronix.de> <20060929234439.158061000@cruncher.tec.linutronix.de> <20060930013612.92e12313.akpm@osdl.org> <1159826617.27968.22.camel@localhost.localdomain> X-Mailer: Sylpheed version 2.2.7 (GTK+ 2.8.6; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1525 Lines: 49 On Mon, 02 Oct 2006 15:03:37 -0700 john stultz wrote: > static int timer_resume(struct sys_device *dev) > { > - unsigned long flags; > - unsigned long sec; > - unsigned long ctime = get_cmos_time(); > - long sleep_length = (ctime - sleep_start) * HZ; > - struct timespec ts; > - > - if (sleep_length < 0) { > - printk(KERN_WARNING "CMOS clock skew detected in timer resume!\n"); > - /* The time after the resume must not be earlier than the time > - * before the suspend or some nasty things will happen > - */ > - sleep_length = 0; > - ctime = sleep_start; > - } > #ifdef CONFIG_HPET_TIMER > if (is_hpet_enabled()) > hpet_reenable(); > #endif > setup_pit_timer(); > - > - sec = ctime + clock_cmos_diff; > - ts.tv_sec = sec; > - ts.tv_nsec = 0; > - do_settimeofday(&ts); > - write_seqlock_irqsave(&xtime_lock, flags); > - jiffies_64 += sleep_length; > - write_sequnlock_irqrestore(&xtime_lock, flags); > touch_softlockup_watchdog(); > return 0; > } In this version of the patch, you no longer remove the touch_softlockup_watchdog() call from timer_resume(). But clockevents-drivers-for-i386.patch deletes timer_resume() altogether. Hence we might need to put that re-added touch_softlockup_watchdog() call into somewhere else now. - 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/