svn commit: r231237 - stable/8/sys/sun4v/include

[Marius Strobl]

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);