From owner-svn-src-all@FreeBSD.ORG  Fri Mar 25 13:09:57 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A53231065679;
	Fri, 25 Mar 2011 13:09:57 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 934F38FC17;
	Fri, 25 Mar 2011 13:09:57 +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 p2PD9vCF082452;
	Fri, 25 Mar 2011 13:09:57 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2PD9v9l082450;
	Fri, 25 Mar 2011 13:09:57 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201103251309.p2PD9v9l082450@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 25 Mar 2011 13:09:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219998 - stable/8/sys/sparc64/sparc64
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 25 Mar 2011 13:09:57 -0000

Author: marius
Date: Fri Mar 25 13:09:57 2011
New Revision: 219998
URL: http://svn.freebsd.org/changeset/base/219998

Log:
  MFC: r219782
  
  On Serengeti-class machines the OFW root isn't the parent of the CPU
  nodes.

Modified:
  stable/8/sys/sparc64/sparc64/tick.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/sparc64/sparc64/tick.c
==============================================================================
--- stable/8/sys/sparc64/sparc64/tick.c	Fri Mar 25 13:08:19 2011	(r219997)
+++ stable/8/sys/sparc64/sparc64/tick.c	Fri Mar 25 13:09:57 2011	(r219998)
@@ -118,8 +118,8 @@ cpu_initclocks(void)
 	sclock = 0;
 	if (PCPU_GET(impl) == CPU_IMPL_SPARC64V ||
 	    PCPU_GET(impl) >= CPU_IMPL_ULTRASPARCIII) {
-		if (OF_getprop(OF_parent(PCPU_GET(node)), "stick-frequency",
-		    &sclock, sizeof(sclock)) == -1) {
+		if (OF_getprop(OF_peer(0), "stick-frequency", &sclock,
+		    sizeof(sclock)) == -1) {
 			panic("%s: could not determine STICK frequency",
 			    __func__);
 		}