From owner-svn-src-all@FreeBSD.ORG  Sat Feb  2 12:52:44 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6F185D0E;
 Sat,  2 Feb 2013 12:52:44 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4D817F99;
 Sat,  2 Feb 2013 12:52:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12CqiV8048759;
 Sat, 2 Feb 2013 12:52:44 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12CqiNT048758;
 Sat, 2 Feb 2013 12:52:44 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201302021252.r12CqiNT048758@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 2 Feb 2013 12:52:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246252 - head/sys/dev/acpica
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Feb 2013 12:52:44 -0000

Author: avg
Date: Sat Feb  2 12:52:43 2013
New Revision: 246252
URL: http://svnweb.freebsd.org/changeset/base/246252

Log:
  revert accidentally committed unneeded changes from r246250
  
  MFC after:	7 days
  X-MFC with:	r246250

Modified:
  head/sys/dev/acpica/acpi.c

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Sat Feb  2 12:44:19 2013	(r246251)
+++ head/sys/dev/acpica/acpi.c	Sat Feb  2 12:52:43 2013	(r246252)
@@ -278,7 +278,7 @@ TUNABLE_INT("debug.acpi.interpreter_slac
 SYSCTL_INT(_debug_acpi, OID_AUTO, interpreter_slack, CTLFLAG_RDTUN,
     &acpi_interpreter_slack, 1, "Turn on interpreter slack mode.");
 
-#if defined(__amd64__) || defined(__i386__)
+#ifdef __amd64__
 /* Reset system clock while resuming.  XXX Remove once tested. */
 static int acpi_reset_clock = 1;
 TUNABLE_INT("debug.acpi.reset_clock", &acpi_reset_clock);
@@ -2848,7 +2848,7 @@ backout:
 static void
 acpi_resync_clock(struct acpi_softc *sc)
 {
-#if defined(__amd64__) || defined(__i386__)
+#ifdef __amd64__
     if (!acpi_reset_clock)
 	return;