From patchwork Wed Aug 25 22:58:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 133231 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7PN0ULr007236 for ; Wed, 25 Aug 2010 23:00:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752776Ab0HYXA3 (ORCPT ); Wed, 25 Aug 2010 19:00:29 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:45848 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751984Ab0HYXA2 (ORCPT ); Wed, 25 Aug 2010 19:00:28 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id F35C6191DC8; Thu, 26 Aug 2010 00:46:20 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 09201-01; Thu, 26 Aug 2010 00:46:14 +0200 (CEST) Received: from ferrari.rjw.lan (unknown [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 5B63C18DB94; Thu, 26 Aug 2010 00:46:14 +0200 (CEST) From: "Rafael J. Wysocki" To: Frederic Weisbecker Subject: [PATCH] watchdog: Allow touch_nmi_watchdog() to be called by acpi_os_stall() Date: Thu, 26 Aug 2010 00:58:17 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-rc2-rjw+; KDE/4.4.4; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, ACPI Devel Maling List , Len Brown MIME-Version: 1.0 Message-Id: <201008260058.17876.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 25 Aug 2010 23:00:30 +0000 (UTC) Index: linux-2.6/kernel/watchdog.c =================================================================== --- linux-2.6.orig/kernel/watchdog.c +++ linux-2.6/kernel/watchdog.c @@ -142,8 +142,8 @@ void touch_all_softlockup_watchdogs(void #ifdef CONFIG_HARDLOCKUP_DETECTOR void touch_nmi_watchdog(void) { - __get_cpu_var(watchdog_nmi_touch) = true; - touch_softlockup_watchdog(); + __raw_get_cpu_var(watchdog_nmi_touch) = true; + __raw_get_cpu_var(watchdog_touch_ts) = 0; } EXPORT_SYMBOL(touch_nmi_watchdog);