3 files changed, 0 insertions, 13 deletions

diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 03afd4e98aad..3d2eaa628ae9 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -172,11 +172,8 @@ alltraps_pushregs_no_rdi:
 	movq	%r14,TF_R14(%rsp)
 	movq	%r15,TF_R15(%rsp)
 alltraps_with_regs_pushed:
-	FAKE_MCOUNT(13*4(%rsp))
 calltrap:
-	FAKE_MCOUNT(btrap)		/* init "from" btrap -> calltrap */
 	call	trap
-	MEXITCOUNT
 	jmp	doreti			/* Handle any pending ASTs */
 
 	/*
@@ -298,7 +295,6 @@ ENTRY(fork_trampoline)
 	movq	%rbx, %rsi		/* arg1 */
 	movq	%rsp, %rdx		/* trapframe pointer */
 	call	fork_exit
-	MEXITCOUNT
 	jmp	doreti			/* Handle any ASTs */
 
 
@@ -322,7 +318,6 @@ ENTRY(fork_trampoline)
 	.globl	doreti
 	.type	doreti,@function
 doreti:
-	FAKE_MCOUNT(bintr)		/* init "from" bintr -> doreti */
 	/*
 	 * Check if ASTs can be handled now.
 	 */
@@ -352,8 +347,6 @@ doreti_ast:
 	 *	registers.  The fault is handled in trap.c.
 	 */
 doreti_exit:
-	MEXITCOUNT
-
 	movq	TF_RDI(%rsp),%rdi
 	movq	TF_RSI(%rsp),%rsi
 	movq	TF_RDX(%rsp),%rdx
diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S
index aa901ef97bbf..6b57be90f820 100644
--- a/sys/amd64/ia32/ia32_exception.S
+++ b/sys/amd64/ia32/ia32_exception.S
@@ -63,7 +63,5 @@ IDTVEC(int0x80_syscall)
 	movq	%r13,TF_R13(%rsp)
 	movq	%r14,TF_R14(%rsp)
 	movq	%r15,TF_R15(%rsp)
-	FAKE_MCOUNT(13*4(%rsp))
 	call	ia32_syscall
-	MEXITCOUNT
 	jmp	doreti
diff --git a/sys/amd64/isa/icu_vector.S b/sys/amd64/isa/icu_vector.S
index d778f3f12acb..123a731f8d25 100644
--- a/sys/amd64/isa/icu_vector.S
+++ b/sys/amd64/isa/icu_vector.S
@@ -43,7 +43,6 @@ IDTVEC(vec_name) ;							\
 	movq	%r13,TF_R13(%rsp) ;					\
 	movq	%r14,TF_R14(%rsp) ;					\
 	movq	%r15,TF_R15(%rsp) ;					\
-	FAKE_MCOUNT((12)*4(%rsp)) ;					\
 	call	critical_enter ;					\
 	movq	PCPU(CURTHREAD),%rbx ;					\
 	incl	TD_INTR_NESTING_LEVEL(%rbx) ;				\
@@ -55,7 +54,6 @@ IDTVEC(vec_name) ;							\
 	incq	(%rax) ;						\
 	decl	TD_INTR_NESTING_LEVEL(%rbx) ;				\
 	call	critical_exit ;						\
-	MEXITCOUNT ;							\
 	jmp	doreti
 
 /* 
@@ -98,11 +96,9 @@ IDTVEC(vec_name) ;							\
 	enable_icus ;							\
 	movq	PCPU(CURTHREAD),%rbx ;					\
 	incl	TD_INTR_NESTING_LEVEL(%rbx) ;				\
-	FAKE_MCOUNT(13*4(%rsp)) ;	/* XXX late to avoid double count */ \
 	movq	$irq_num, %rdi;	/* pass the IRQ */			\
 	call	sched_ithd ;						\
 	decl	TD_INTR_NESTING_LEVEL(%rbx) ;				\
-	MEXITCOUNT ;							\
 	/* We could usually avoid the following jmp by inlining some of */ \
 	/* doreti, but it's probably better to use less cache. */	\
 	jmp	doreti