From owner-svn-src-stable-8@FreeBSD.ORG Wed Feb 8 23:47:22 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2DF4106564A; Wed, 8 Feb 2012 23:47:22 +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 B0C468FC14; Wed, 8 Feb 2012 23:47:22 +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 q18NlM2l070544; Wed, 8 Feb 2012 23:47:22 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q18NlMAb070541; Wed, 8 Feb 2012 23:47:22 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201202082347.q18NlMAb070541@svn.freebsd.org> From: Marius Strobl Date: Wed, 8 Feb 2012 23:47:22 +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: r231237 - stable/8/sys/sun4v/include X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2012 23:47:22 -0000 Author: marius Date: Wed Feb 8 23:47:22 2012 New Revision: 231237 URL: http://svn.freebsd.org/changeset/base/231237 Log: Merge from r230889: Mark cpu_{halt,reset}() and hv_mach_{exit,sir}() as __dead2 as appropriate. This is a direct commit to stable/8. Modified: stable/8/sys/sun4v/include/cpu.h stable/8/sys/sun4v/include/hv_api.h Modified: stable/8/sys/sun4v/include/cpu.h ============================================================================== --- stable/8/sys/sun4v/include/cpu.h Wed Feb 8 23:34:47 2012 (r231236) +++ stable/8/sys/sun4v/include/cpu.h Wed Feb 8 23:47:22 2012 (r231237) @@ -53,8 +53,8 @@ extern void cpu_yield(void); extern char btext[]; extern char etext[]; -void cpu_halt(void); -void cpu_reset(void); +void cpu_halt(void) __dead2; +void cpu_reset(void) __dead2; void fork_trampoline(void); void swi_vm(void *v); Modified: stable/8/sys/sun4v/include/hv_api.h ============================================================================== --- stable/8/sys/sun4v/include/hv_api.h Wed Feb 8 23:34:47 2012 (r231236) +++ stable/8/sys/sun4v/include/hv_api.h Wed Feb 8 23:47:22 2012 (r231237) @@ -52,8 +52,8 @@ typedef uint64_t io_addr_t; * Section 10 Domain Services */ -extern void hv_mach_sir(void); -extern void hv_mach_exit(uint64_t exit_code); +extern void hv_mach_sir(void) __dead2; +extern void hv_mach_exit(uint64_t exit_code) __dead2; extern uint64_t hv_mach_desc(uint64_t buffer_ra, uint64_t *buffer_sizep); extern uint64_t hv_mach_watchdog(uint64_t timeout, uint64_t *time_remaining);