From owner-svn-src-all@FreeBSD.ORG  Fri Jan 27 22:35:54 2012
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 86AF5106566C;
	Fri, 27 Jan 2012 22:35:54 +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 5B1608FC17;
	Fri, 27 Jan 2012 22:35:54 +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 q0RMZsJV063831;
	Fri, 27 Jan 2012 22:35:54 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0RMZsvu063828;
	Fri, 27 Jan 2012 22:35:54 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201201272235.q0RMZsvu063828@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 27 Jan 2012 22:35:54 +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: r230632 - in head/sys/sparc64: include 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, 27 Jan 2012 22:35:54 -0000

Author: marius
Date: Fri Jan 27 22:35:53 2012
New Revision: 230632
URL: http://svn.freebsd.org/changeset/base/230632

Log:
  - Now that we have a working OF_printf() since r230631, use it for
    implementing a simple OF_panic() that may be used during the early
    cycles when panic() isn't available, yet.
  - Mark cpu_{exit,shutdown}() as __dead2 as appropriate.

Modified:
  head/sys/sparc64/include/ofw_machdep.h
  head/sys/sparc64/sparc64/ofw_machdep.c

Modified: head/sys/sparc64/include/ofw_machdep.h
==============================================================================
--- head/sys/sparc64/include/ofw_machdep.h	Fri Jan 27 22:29:29 2012	(r230631)
+++ head/sys/sparc64/include/ofw_machdep.h	Fri Jan 27 22:35:53 2012	(r230632)
@@ -37,8 +37,9 @@ typedef uint64_t cell_t;
 int  OF_decode_addr(phandle_t, int, int *, bus_addr_t *);
 void OF_getetheraddr(device_t, u_char *);
 u_int OF_getscsinitid(device_t);
-void cpu_shutdown(void *);
+void OF_panic(const char *fmt, ...) __dead2 __printflike(1, 2);
+void cpu_shutdown(void *) __dead2;
 int  ofw_entry(void *);
-void ofw_exit(void *);
+void ofw_exit(void *) __dead2;
 
 #endif /* _MACHINE_OFW_MACHDEP_H_ */

Modified: head/sys/sparc64/sparc64/ofw_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/ofw_machdep.c	Fri Jan 27 22:29:29 2012	(r230631)
+++ head/sys/sparc64/sparc64/ofw_machdep.c	Fri Jan 27 22:35:53 2012	(r230632)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/idprom.h>
 #include <machine/ofw_machdep.h>
+#include <machine/stdarg.h>
 
 void
 OF_getetheraddr(device_t dev, u_char *addr)
@@ -81,6 +82,19 @@ OF_getscsinitid(device_t dev)
 	return (7);
 }
 
+void
+OF_panic(const char *fmt, ...)
+{
+	char buf[256];
+	va_list ap;
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
+	OF_printf("OF_panic: %s\n", buf);
+	va_end(ap);
+	OF_exit();
+}
+
 static __inline uint32_t
 phys_hi_mask_space(const char *bus, uint32_t phys_hi)
 {