diff options
| author |   naddy <naddy@openbsd.org> | 2017-07-24 15:17:31 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2017-07-24 15:17:31 +0000 |
| commit | 19d05f23bc2f2c0f7efd680be51127561e034288 (patch) | |
| tree | 08f62ccd87ce396a2f33ece2583d1ccba9fc1d97 | |
| parent | Extend the scope of the socket lock to protect `so_state' in connect(2). (diff) | |
| download | wireguard-openbsd-19d05f23bc2f2c0f7efd680be51127561e034288.tar.xz wireguard-openbsd-19d05f23bc2f2c0f7efd680be51127561e034288.zip | |
add MULTIPROCESSOR guards around otherwise unused pieces to satisfy clang
ok deraadt@ kettenis@
| -rw-r--r-- | sys/arch/i386/i386/amd64errata.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/lapic.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/amd64errata.c b/sys/arch/i386/i386/amd64errata.c index 71bb60318de..6d0faee783c 100644 --- a/sys/arch/i386/i386/amd64errata.c +++ b/sys/arch/i386/i386/amd64errata.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amd64errata.c,v 1.6 2013/12/07 01:43:50 brad Exp $ */ +/* $OpenBSD: amd64errata.c,v 1.7 2017/07/24 15:17:31 naddy Exp $ */ /* $NetBSD: errata.c,v 1.6 2007/02/05 21:05:45 ad Exp $ */ /*- @@ -92,9 +92,11 @@ static const uint8_t amd64_errata_set1[] = { SH_B3, SH_C0, SH_CG, DH_CG, CH_CG, OINK }; +#ifdef MULTIPROCESSOR static const uint8_t amd64_errata_set2[] = { SH_B3, SH_C0, SH_CG, DH_CG, CH_CG, SH_D0, DH_D0, CH_D0, OINK }; +#endif static const uint8_t amd64_errata_set3[] = { JH_E1, DH_E3, OINK diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c index 999b0255ff0..7eb4e8768d1 100644 --- a/sys/arch/i386/i386/lapic.c +++ b/sys/arch/i386/i386/lapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lapic.c,v 1.40 2015/07/18 19:21:03 sf Exp $ */ +/* $OpenBSD: lapic.c,v 1.41 2017/07/24 15:17:31 naddy Exp $ */ /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */ /*- @@ -420,6 +420,7 @@ lapic_delay(int usec) * XXX the following belong mostly or partly elsewhere.. */ +#ifdef MULTIPROCESSOR static __inline void i82489_icr_wait(void); static __inline void @@ -439,7 +440,6 @@ i82489_icr_wait(void) } } -#ifdef MULTIPROCESSOR void i386_ipi_init(int target) { |