summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2007-03-30 18:27:57 +0000
committerjkim <jkim@FreeBSD.org>2007-03-30 18:27:57 +0000
commit4f1754c08d27088022ad18cfbcd14c64ffa33bd9 (patch)
treeca5d952040874059669a3ec81bdaf5fbc3ec2c85 /sys/i386
parentb756d10ae05259e831ed4fcfa0b7a9d765362ac5 (diff)
downloadFreeBSD-src-4f1754c08d27088022ad18cfbcd14c64ffa33bd9.zip
FreeBSD-src-4f1754c08d27088022ad18cfbcd14c64ffa33bd9.tar.gz
Use the same wisdom of sys/i386/i386/support.s 1.97 to remove obfuscation.
Pointed out by: bde
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/i386/support.s17
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 4083c03..9b2f5f0 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -1524,12 +1524,6 @@ ENTRY(longjmp)
bbhead:
.long 0
-#if defined(SMP) || !defined(_KERNEL)
-#define MPLOCKED lock ;
-#else
-#define MPLOCKED
-#endif
-
.text
NON_GPROF_ENTRY(__bb_init_func)
movl 4(%esp),%eax
@@ -1557,7 +1551,10 @@ ENTRY(futex_xchgl)
cmpl $VM_MAXUSER_ADDRESS,%edx
ja futex_fault
- MPLOCKED xchgl %eax, (%edx)
+#if defined(SMP) || !defined(_KERNEL)
+ lock
+#endif
+ xchgl %eax, (%edx)
movl 0xc(%esp), %edx
movl %eax, (%edx)
xorl %eax, %eax
@@ -1575,7 +1572,10 @@ ENTRY(futex_addl)
cmpl $VM_MAXUSER_ADDRESS,%edx
ja futex_fault
- MPLOCKED xaddl %eax, (%edx)
+#if defined(SMP) || !defined(_KERNEL)
+ lock
+#endif
+ xaddl %eax, (%edx)
movl 0xc(%esp), %edx
movl %eax, (%edx)
xorl %eax, %eax
@@ -1583,4 +1583,3 @@ ENTRY(futex_addl)
movl PCPU(CURPCB), %edx
movl $0, PCB_ONFAULT(%edx)
ret
-
OpenPOWER on IntegriCloud