svn commit: r256496 - in head/sys/mips: include mips

[Warner Losh]

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