diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1997-05-29 04:58:04 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1997-05-29 04:58:04 +0000 |
| commit | ecf8148761dc5a9b856e5dfabd1ee64befd8edb8 (patch) | |
| tree | 0f339175692ededaccbe0c487c9cdbc2a3df4130 | |
| parent | 6b19c20ba548e8dd84b96ec6c1294920c5b8e543 (diff) | |
remove opt_smp.h from this well-included file, minor style police
Notes
Notes:
svn path=/head/; revision=26263
| -rw-r--r-- | sys/amd64/isa/icu.h | 18 | ||||
| -rw-r--r-- | sys/i386/isa/icu.h | 18 |
2 files changed, 16 insertions, 20 deletions
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h index a16118e66d05..8c1326defe25 100644 --- a/sys/amd64/isa/icu.h +++ b/sys/amd64/isa/icu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $Id: icu.h,v 1.11 1997/04/26 11:45:53 peter Exp $ + * $Id: icu.h,v 1.12 1997/04/27 21:18:58 fsmp Exp $ */ /* @@ -47,8 +47,6 @@ #ifndef LOCORE -#include "opt_smp.h" /* so we dont have to change EVERY file including icu.h */ - /* * Interrupt "level" mechanism variables, masks, and macros */ @@ -66,29 +64,29 @@ void write_io_apic_mask24 __P((int, u_int32_t)); /* i386/i386/mpapic.c */ #endif /* MULTIPLE_IOAPICS */ static __inline u_int32_t -INTRGET( void ) +INTRGET(void) { return (imen & 0x00ffffff); /* return our global copy */ } static __inline void -INTRSET( unsigned s ) +INTRSET(unsigned s) { - write_io_apic_mask24( 0, s ); + write_io_apic_mask24(0, s); imen = s; } static __inline void -INTREN( unsigned s ) +INTREN(unsigned s) { - write_io_apic_mask24( 0, imen & ~s ); + write_io_apic_mask24(0, imen & ~s); imen &= ~s; } static __inline void -INTRDIS( unsigned s ) +INTRDIS(unsigned s) { - write_io_apic_mask24( 0, imen | s ); + write_io_apic_mask24(0, imen | s); imen |= s; } diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index a16118e66d05..8c1326defe25 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $Id: icu.h,v 1.11 1997/04/26 11:45:53 peter Exp $ + * $Id: icu.h,v 1.12 1997/04/27 21:18:58 fsmp Exp $ */ /* @@ -47,8 +47,6 @@ #ifndef LOCORE -#include "opt_smp.h" /* so we dont have to change EVERY file including icu.h */ - /* * Interrupt "level" mechanism variables, masks, and macros */ @@ -66,29 +64,29 @@ void write_io_apic_mask24 __P((int, u_int32_t)); /* i386/i386/mpapic.c */ #endif /* MULTIPLE_IOAPICS */ static __inline u_int32_t -INTRGET( void ) +INTRGET(void) { return (imen & 0x00ffffff); /* return our global copy */ } static __inline void -INTRSET( unsigned s ) +INTRSET(unsigned s) { - write_io_apic_mask24( 0, s ); + write_io_apic_mask24(0, s); imen = s; } static __inline void -INTREN( unsigned s ) +INTREN(unsigned s) { - write_io_apic_mask24( 0, imen & ~s ); + write_io_apic_mask24(0, imen & ~s); imen &= ~s; } static __inline void -INTRDIS( unsigned s ) +INTRDIS(unsigned s) { - write_io_apic_mask24( 0, imen | s ); + write_io_apic_mask24(0, imen | s); imen |= s; } |