mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

Garbage-collect the "LOCORE" version of MPLOCKED.

Browse Source
This commit is contained in:
Bruce Evans 2002-02-11 03:41:59 +00:00
parent f2671fcf9f
commit d2f22d707a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=90515
5 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/amd64/exception.S
View File

@ -37,7 +37,6 @@
#include <machine/asmacros.h> #include <machine/asmacros.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <machine/atomic.h>
#include <machine/psl.h> #include <machine/psl.h>
#include <machine/trap.h> #include <machine/trap.h>
#ifdef SMP #ifdef SMP

1
sys/amd64/amd64/exception.s
View File

@ -37,7 +37,6 @@
#include <machine/asmacros.h> #include <machine/asmacros.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <machine/atomic.h>
#include <machine/psl.h> #include <machine/psl.h>
#include <machine/trap.h> #include <machine/trap.h>
#ifdef SMP #ifdef SMP

12
sys/amd64/include/atomic.h
View File

@ -80,16 +80,11 @@ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v);
* the binaries will run on both types of systems. * the binaries will run on both types of systems.
*/ */
#if defined(SMP) || !defined(_KERNEL) #if defined(SMP) || !defined(_KERNEL)
#if defined(LOCORE)
#define MPLOCKED lock ;
#else /* !LOCORE */
#define MPLOCKED "lock ; " #define MPLOCKED "lock ; "
#endif /* LOCORE */ #else
#else /* SMP || !_KERNEL */
#define MPLOCKED #define MPLOCKED
#endif /* SMP || !_KERNEL */ #endif
#if !defined(LOCORE)
/* /*
* The assembly is volatilized to demark potential before-and-after side * The assembly is volatilized to demark potential before-and-after side
* effects if an interrupt or SMP collision were to occur. * effects if an interrupt or SMP collision were to occur.
@ -205,10 +200,8 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
: : "memory"); \ : : "memory"); \
} }
#endif /* defined(I386_CPU) */ #endif /* defined(I386_CPU) */
#endif /* !defined(LOCORE) */
#endif /* KLD_MODULE */ #endif /* KLD_MODULE */
#if !defined(LOCORE)
ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v) ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v)
ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v) ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v)
ATOMIC_ASM(add, char, "addb %b1,%0", "iq", v) ATOMIC_ASM(add, char, "addb %b1,%0", "iq", v)
@ -407,5 +400,4 @@ atomic_readandclear_long(volatile u_long *addr)
return (result); return (result);
} }
#endif /* !defined(WANT_FUNCTIONS) */ #endif /* !defined(WANT_FUNCTIONS) */
#endif /* !defined(LOCORE) */
#endif /* ! _MACHINE_ATOMIC_H_ */ #endif /* ! _MACHINE_ATOMIC_H_ */

1
sys/i386/i386/exception.s
View File

@ -37,7 +37,6 @@
#include <machine/asmacros.h> #include <machine/asmacros.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <machine/atomic.h>
#include <machine/psl.h> #include <machine/psl.h>
#include <machine/trap.h> #include <machine/trap.h>
#ifdef SMP #ifdef SMP

12
sys/i386/include/atomic.h
View File

@ -80,16 +80,11 @@ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v);
* the binaries will run on both types of systems. * the binaries will run on both types of systems.
*/ */
#if defined(SMP) || !defined(_KERNEL) #if defined(SMP) || !defined(_KERNEL)
#if defined(LOCORE)
#define MPLOCKED lock ;
#else /* !LOCORE */
#define MPLOCKED "lock ; " #define MPLOCKED "lock ; "
#endif /* LOCORE */ #else
#else /* SMP || !_KERNEL */
#define MPLOCKED #define MPLOCKED
#endif /* SMP || !_KERNEL */ #endif
#if !defined(LOCORE)
/* /*
* The assembly is volatilized to demark potential before-and-after side * The assembly is volatilized to demark potential before-and-after side
* effects if an interrupt or SMP collision were to occur. * effects if an interrupt or SMP collision were to occur.
@ -205,10 +200,8 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
: : "memory"); \ : : "memory"); \
} }
#endif /* defined(I386_CPU) */ #endif /* defined(I386_CPU) */
#endif /* !defined(LOCORE) */
#endif /* KLD_MODULE */ #endif /* KLD_MODULE */
#if !defined(LOCORE)
ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v) ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v)
ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v) ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v)
ATOMIC_ASM(add, char, "addb %b1,%0", "iq", v) ATOMIC_ASM(add, char, "addb %b1,%0", "iq", v)
@ -407,5 +400,4 @@ atomic_readandclear_long(volatile u_long *addr)
return (result); return (result);
} }
#endif /* !defined(WANT_FUNCTIONS) */ #endif /* !defined(WANT_FUNCTIONS) */
#endif /* !defined(LOCORE) */
#endif /* ! _MACHINE_ATOMIC_H_ */ #endif /* ! _MACHINE_ATOMIC_H_ */