From a31bad69da8c235286fe6f2d7add5b60c99ad268 Mon Sep 17 00:00:00 2001
From: Tor Egge <tegge@FreeBSD.org>
Date: Wed, 16 Jun 1999 03:53:52 +0000
Subject: [PATCH] Clean up bitrot in interrupt tracing code.

---
 sys/amd64/amd64/apic_vector.S | 6 +++---
 sys/i386/i386/apic_vector.s   | 6 +++---
 sys/i386/isa/apic_vector.s    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 11d370e719b8..09e1b87d88df 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.38 1999/05/28 14:08:57 bde Exp $
+ *	$Id: apic_vector.s,v 1.39 1999/06/01 18:20:11 jlemon Exp $
  */
 
 
@@ -264,7 +264,7 @@ log_intr_event:
 	pushf
 	cli
 	pushl	$CNAME(apic_itrace_debuglock)
-	call	_s_lock_np
+	call	CNAME(s_lock_np)
 	addl	$4, %esp
 	movl	CNAME(apic_itrace_debugbuffer_idx), %ecx
 	andl	$32767, %ecx
@@ -276,7 +276,7 @@ log_intr_event:
 	andl	$32767, %ecx
 	movl	%ecx,	CNAME(apic_itrace_debugbuffer_idx)
 	pushl	$CNAME(apic_itrace_debuglock)
-	call	_s_unlock_np
+	call	CNAME(s_unlock_np)
 	addl	$4, %esp
 	popf
 	ret
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s
index 11d370e719b8..09e1b87d88df 100644
--- a/sys/i386/i386/apic_vector.s
+++ b/sys/i386/i386/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.38 1999/05/28 14:08:57 bde Exp $
+ *	$Id: apic_vector.s,v 1.39 1999/06/01 18:20:11 jlemon Exp $
  */
 
 
@@ -264,7 +264,7 @@ log_intr_event:
 	pushf
 	cli
 	pushl	$CNAME(apic_itrace_debuglock)
-	call	_s_lock_np
+	call	CNAME(s_lock_np)
 	addl	$4, %esp
 	movl	CNAME(apic_itrace_debugbuffer_idx), %ecx
 	andl	$32767, %ecx
@@ -276,7 +276,7 @@ log_intr_event:
 	andl	$32767, %ecx
 	movl	%ecx,	CNAME(apic_itrace_debugbuffer_idx)
 	pushl	$CNAME(apic_itrace_debuglock)
-	call	_s_unlock_np
+	call	CNAME(s_unlock_np)
 	addl	$4, %esp
 	popf
 	ret
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s
index 11d370e719b8..09e1b87d88df 100644
--- a/sys/i386/isa/apic_vector.s
+++ b/sys/i386/isa/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.38 1999/05/28 14:08:57 bde Exp $
+ *	$Id: apic_vector.s,v 1.39 1999/06/01 18:20:11 jlemon Exp $
  */
 
 
@@ -264,7 +264,7 @@ log_intr_event:
 	pushf
 	cli
 	pushl	$CNAME(apic_itrace_debuglock)
-	call	_s_lock_np
+	call	CNAME(s_lock_np)
 	addl	$4, %esp
 	movl	CNAME(apic_itrace_debugbuffer_idx), %ecx
 	andl	$32767, %ecx
@@ -276,7 +276,7 @@ log_intr_event:
 	andl	$32767, %ecx
 	movl	%ecx,	CNAME(apic_itrace_debugbuffer_idx)
 	pushl	$CNAME(apic_itrace_debuglock)
-	call	_s_unlock_np
+	call	CNAME(s_unlock_np)
 	addl	$4, %esp
 	popf
 	ret