From owner-svn-src-head@FreeBSD.ORG  Sun Mar 13 21:23:26 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 505AB1065675;
	Sun, 13 Mar 2011 21:23:26 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EF8F8FC18;
	Sun, 13 Mar 2011 21:23:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2DLNQnn066364;
	Sun, 13 Mar 2011 21:23:26 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2DLNQmp066362;
	Sun, 13 Mar 2011 21:23:26 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201103132123.p2DLNQmp066362@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 13 Mar 2011 21:23:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219624 - head/sys/powerpc/powermac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2011 21:23:26 -0000

Author: nwhitehorn
Date: Sun Mar 13 21:23:25 2011
New Revision: 219624
URL: http://svn.freebsd.org/changeset/base/219624

Log:
  Don't sleep while setting the clock. This can cause panics when
  periodic_resettodr() calls CLOCK_SETTIME() and smu tries to sleep while
  running from a callout.
  
  Reported by:	Torfinn Ingolfsen

Modified:
  head/sys/powerpc/powermac/smu.c

Modified: head/sys/powerpc/powermac/smu.c
==============================================================================
--- head/sys/powerpc/powermac/smu.c	Sun Mar 13 20:02:39 2011	(r219623)
+++ head/sys/powerpc/powermac/smu.c	Sun Mar 13 21:23:25 2011	(r219624)
@@ -1177,7 +1177,7 @@ smu_gettime(device_t dev, struct timespe
 static int
 smu_settime(device_t dev, struct timespec *ts)
 {
-	struct smu_cmd cmd;
+	static struct smu_cmd cmd;
 	struct clocktime ct;
 
 	cmd.cmd = SMU_RTC;
@@ -1194,7 +1194,7 @@ smu_settime(device_t dev, struct timespe
 	cmd.data[6] = bin2bcd(ct.mon);
 	cmd.data[7] = bin2bcd(ct.year - 2000);
 
-	return (smu_run_cmd(dev, &cmd, 1));
+	return (smu_run_cmd(dev, &cmd, 0));
 }
 
 /* SMU I2C Interface */