From 7ef900f1688269eab5c74e991f3290cb4cf20d01 Mon Sep 17 00:00:00 2001
From: fsmp <fsmp@FreeBSD.org>
Date: Sat, 9 Aug 1997 22:52:59 +0000
Subject: Minor conditionalization of XXX_MPLOCK on PEND_INTS.

---
 sys/amd64/amd64/exception.S | 5 ++++-
 sys/amd64/amd64/exception.s | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'sys/amd64')

diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index f51cd0f..2d81b17 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.34 1997/07/31 05:43:02 fsmp Exp $
+ *	$Id: exception.s,v 1.35 1997/08/09 00:02:31 dyson Exp $
  */
 
 #include "npx.h"				/* NNPX */
@@ -43,10 +43,13 @@
 #ifdef SMP
 
 #include <machine/apic.h>			/* for apic_vector.s */
+#include <machine/smptests.h>			/** PEND_INTS */
 
+#ifndef PEND_INTS
 /* generic giant-lock calls */
 #define GET_MPLOCK		call _get_mplock
 #define REL_MPLOCK		call _rel_mplock
+#endif /* PEND_INTS */
 
 /* ISR specific giant-lock calls */
 #define GET_ISRLOCK(N)		call _get_isrlock
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index f51cd0f..2d81b17 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.34 1997/07/31 05:43:02 fsmp Exp $
+ *	$Id: exception.s,v 1.35 1997/08/09 00:02:31 dyson Exp $
  */
 
 #include "npx.h"				/* NNPX */
@@ -43,10 +43,13 @@
 #ifdef SMP
 
 #include <machine/apic.h>			/* for apic_vector.s */
+#include <machine/smptests.h>			/** PEND_INTS */
 
+#ifndef PEND_INTS
 /* generic giant-lock calls */
 #define GET_MPLOCK		call _get_mplock
 #define REL_MPLOCK		call _rel_mplock
+#endif /* PEND_INTS */
 
 /* ISR specific giant-lock calls */
 #define GET_ISRLOCK(N)		call _get_isrlock
-- 
cgit v1.1