aboutsummaryrefslogtreecommitdiff
path: root/sys/amd64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/apic_vector.S5
-rw-r--r--sys/amd64/include/apicreg.h1
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 8e7ac0372051..ca909d907e69 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -26,9 +26,8 @@
call _get_isrlock
#define REL_FAST_INTR_LOCK \
- pushl $_mp_lock ; /* GIANT_LOCK */ \
- call _MPrellock ; \
- add $4, %esp
+ movl $_mp_lock, %edx ; /* GIANT_LOCK */ \
+ call _MPrellock_edx
#endif /* FAST_SIMPLELOCK */
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index 38c70709e7c2..be9de4f8fe1f 100644
--- a/sys/amd64/include/apicreg.h
+++ b/sys/amd64/include/apicreg.h
@@ -223,6 +223,7 @@ typedef struct IOAPIC ioapic_t;
/* XXX these 2 don't really belong here... */
#define COUNT_FIELD 0x00ffffff /* count portion of the lock */
+#define CPU_FIELD 0xff000000 /* cpu portion of the lock */
#define FREE_LOCK 0xffffffff /* value of lock when free */
/*