From owner-svn-src-all@FreeBSD.ORG  Fri Mar  2 20:34:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D7482106564A;
	Fri,  2 Mar 2012 20:34:15 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C317A8FC08;
	Fri,  2 Mar 2012 20:34:15 +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 q22KYFMk046225;
	Fri, 2 Mar 2012 20:34:15 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q22KYFdC046223;
	Fri, 2 Mar 2012 20:34:15 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203022034.q22KYFdC046223@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 2 Mar 2012 20:34:15 +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: r232402 - head/sys/mips/cavium
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, 02 Mar 2012 20:34:15 -0000

Author: jmallett
Date: Fri Mar  2 20:34:15 2012
New Revision: 232402
URL: http://svn.freebsd.org/changeset/base/232402

Log:
  Unbreak SMP on stock Octeon systems -- copy the core_mask from bootinfo into
  sysinfo.  This should have been done as part of replacing bootinfo with sysinfo.

Modified:
  head/sys/mips/cavium/octeon_machdep.c

Modified: head/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- head/sys/mips/cavium/octeon_machdep.c	Fri Mar  2 18:55:19 2012	(r232401)
+++ head/sys/mips/cavium/octeon_machdep.c	Fri Mar  2 20:34:15 2012	(r232402)
@@ -575,6 +575,7 @@ octeon_process_app_desc_ver_6(void)
 		octeon_bootinfo->compact_flash_common_base_addr;
 	cvmx_sysinfo_get()->compact_flash_attribute_base_addr = 
 		octeon_bootinfo->compact_flash_attribute_base_addr;
+	cvmx_sysinfo_get()->core_mask = octeon_bootinfo->core_mask;
 }
 
 static void