From owner-svn-src-all@FreeBSD.ORG  Tue Oct 15 04:44:22 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AA749C8E;
 Tue, 15 Oct 2013 04:44:22 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9748E2FA0;
 Tue, 15 Oct 2013 04:44:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9F4iMTl096352;
 Tue, 15 Oct 2013 04:44:22 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9F4iMZc096350;
 Tue, 15 Oct 2013 04:44:22 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201310150444.r9F4iMZc096350@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 15 Oct 2013 04:44:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256496 - in head/sys/mips: include mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 15 Oct 2013 04:44:22 -0000

Author: imp
Date: Tue Oct 15 04:44:21 2013
New Revision: 256496
URL: http://svnweb.freebsd.org/changeset/base/256496

Log:
  Replace NLEAF with LEAF_NOPROFILE to unify the conventions we use in
  our assembler files.
  
  Reviewed by:	jmallet@

Modified:
  head/sys/mips/include/asm.h
  head/sys/mips/mips/exception.S

Modified: head/sys/mips/include/asm.h
==============================================================================
--- head/sys/mips/include/asm.h	Tue Oct 15 04:43:31 2013	(r256495)
+++ head/sys/mips/include/asm.h	Tue Oct 15 04:44:21 2013	(r256496)
@@ -264,7 +264,6 @@ _C_LABEL(x):
 /*
  * XXX retain dialects XXX
  */
-#define	NLEAF(x)			LEAF_NOPROFILE(x)
 #define	NON_LEAF(x, fsize, retpc)	NESTED(x, fsize, retpc)
 #define	NNON_LEAF(x, fsize, retpc)	NESTED_NOPROFILE(x, fsize, retpc)
 

Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S	Tue Oct 15 04:43:31 2013	(r256495)
+++ head/sys/mips/mips/exception.S	Tue Oct 15 04:44:21 2013	(r256496)
@@ -838,7 +838,7 @@ NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, r
 	.set	at
 END(MipsUserIntr)
 
-NLEAF(MipsTLBInvalidException)
+LEAF_NOPROFILE(MipsTLBInvalidException)
 	.set push
 	.set noat
 	.set noreorder
@@ -1029,7 +1029,7 @@ END(MipsTLBInvalidException)
  *
  *----------------------------------------------------------------------------
  */
-NLEAF(MipsTLBMissException)
+LEAF_NOPROFILE(MipsTLBMissException)
 	.set	noat
 	MFC0		k0, MIPS_COP_0_BAD_VADDR	# k0=bad address
 	PTR_LI		k1, VM_MAX_KERNEL_ADDRESS	# check fault address against