Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/kern_mutex.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/kern_mutex.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- src/sys/kern/kern_mutex.c	2008/05/31 13:15:21	1.42
+++ src/sys/kern/kern_mutex.c	2008/05/31 13:31:25	1.43
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_mutex.c,v 1.42 2008/05/31 13:15:21 ad Exp $	*/
+/*	$NetBSD: kern_mutex.c,v 1.43 2008/05/31 13:31:25 ad Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #define	__MUTEX_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.42 2008/05/31 13:15:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.43 2008/05/31 13:31:25 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -306,17 +306,12 @@ mutex_dump(volatile void *cookie)
  *	generates a lot of machine code in the DIAGNOSTIC case, so
  *	we ask the compiler to not inline it.
  */
-
-#if __GNUC_PREREQ__(3, 0)
-__attribute ((noinline)) __attribute ((noreturn))
-#endif
-void
+void __noinline
 mutex_abort(kmutex_t *mtx, const char *func, const char *msg)
 {
 
 	LOCKDEBUG_ABORT(mtx, (MUTEX_SPIN_P(mtx) ?
 	    &mutex_spin_lockops : &mutex_adaptive_lockops), func, msg);
-	/* NOTREACHED */
 }
 
 /*