diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-04-28 00:25:00 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-04-28 00:25:00 +0000 |
| commit | ecd7dfd8280b6257331cea4611ea732750554b87 (patch) | |
| tree | b885fcc38f260e3082b647215278c70063c3dcb3 /sys/i386/include/cpufunc.h | |
| parent | 0790f4214591b191c6fd5363f1a4f0973a8ee3e8 (diff) | |
| download | FreeBSD-src-ecd7dfd8280b6257331cea4611ea732750554b87.zip FreeBSD-src-ecd7dfd8280b6257331cea4611ea732750554b87.tar.gz | |
remove all the SMP_INVLTLB defines, making the code default for APIC_IO.
Reviewed by: informal discussion with Peter Wemm <peter@spinner.DIALix.COM>
Diffstat (limited to 'sys/i386/include/cpufunc.h')
| -rw-r--r-- | sys/i386/include/cpufunc.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index afb48f7..53e5224 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.63 1997/04/26 11:45:36 peter Exp $ + * $Id: cpufunc.h,v 1.64 1997/04/26 20:04:18 peter Exp $ */ /* @@ -46,7 +46,6 @@ #ifdef KERNEL #include "opt_smp.h" -#include "opt_smp_invltlb.h" #endif #ifdef __GNUC__ @@ -207,7 +206,8 @@ invd(void) __asm __volatile("invd"); } -#if defined(SMP) && defined(SMP_INVLTLB) && defined(KERNEL) +#ifdef KERNEL +#ifdef SMP /* * When using APIC IPI's, the inlining cost is prohibitive.. @@ -215,7 +215,7 @@ invd(void) void invlpg __P((u_int addr)); void invltlb __P((void)); -#else +#else /* !SMP */ static __inline void invlpg(u_int addr) @@ -234,7 +234,9 @@ invltlb(void) __asm __volatile("movl %%cr3, %0; movl %0, %%cr3" : "=r" (temp) : : "memory"); } -#endif /* SMP && SMP_INVLTLB && KERNEL */ + +#endif /* SMP */ +#endif /* KERNEL */ static __inline u_short inw(u_int port) |
