From owner-svn-src-stable-7@FreeBSD.ORG  Mon Jul 25 14:34:31 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0704B106566B;
	Mon, 25 Jul 2011 14:34:31 +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 E9A418FC13;
	Mon, 25 Jul 2011 14:34:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6PEYUif060395;
	Mon, 25 Jul 2011 14:34:30 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6PEYUYv060393;
	Mon, 25 Jul 2011 14:34:30 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201107251434.p6PEYUYv060393@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 25 Jul 2011 14:34:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224311 - stable/7/sys/sparc64/sparc64
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2011 14:34:31 -0000

Author: marius
Date: Mon Jul 25 14:34:30 2011
New Revision: 224311
URL: http://svn.freebsd.org/changeset/base/224311

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

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

Modified: stable/7/sys/sparc64/sparc64/tick.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/tick.c	Mon Jul 25 14:33:37 2011	(r224310)
+++ stable/7/sys/sparc64/sparc64/tick.c	Mon Jul 25 14:34:30 2011	(r224311)
@@ -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__);
 		}