diff options
| author |   visa <visa@openbsd.org> | 2017-01-24 02:28:17 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2017-01-24 02:28:17 +0000 |
| commit | 9a1bdb585a3208ba46b0b6790337beae112c5fe6 (patch) | |
| tree | 5e2449c349896ab472a58c7d0da4a961dbf7726e | |
| parent | Introduce ticket support. To enable them it is enough to set a positive (diff) | |
| download | wireguard-openbsd-9a1bdb585a3208ba46b0b6790337beae112c5fe6.tar.xz wireguard-openbsd-9a1bdb585a3208ba46b0b6790337beae112c5fe6.zip | |
Use header <sys/atomic.h> rather than <machine/atomic.h> in MI code.
OK mpi@ deraadt@
| -rw-r--r-- | sys/dev/ic/qla.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/qlw.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/drm_atomic.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/qle.c | 4 | ||||
| -rw-r--r-- | sys/sys/proc.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c index a0b37c7d72e..a799ea0d6bf 100644 --- a/sys/dev/ic/qla.c +++ b/sys/dev/ic/qla.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qla.c,v 1.54 2016/05/10 11:16:18 dlg Exp $ */ +/* $OpenBSD: qla.c,v 1.55 2017/01/24 02:28:17 visa Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -19,6 +19,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/atomic.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/malloc.h> @@ -28,7 +29,6 @@ #include <sys/sensors.h> #include <sys/queue.h> -#include <machine/atomic.h> #include <machine/bus.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c index 0365c4a4274..a56ac43a40d 100644 --- a/sys/dev/ic/qlw.c +++ b/sys/dev/ic/qlw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qlw.c,v 1.30 2015/09/17 17:59:15 miod Exp $ */ +/* $OpenBSD: qlw.c,v 1.31 2017/01/24 02:28:17 visa Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -20,6 +20,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/atomic.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/malloc.h> @@ -29,7 +30,6 @@ #include <sys/sensors.h> #include <sys/queue.h> -#include <machine/atomic.h> #include <machine/bus.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/pci/drm/drm_atomic.h b/sys/dev/pci/drm/drm_atomic.h index ef924ffcd8c..b5848a43638 100644 --- a/sys/dev/pci/drm/drm_atomic.h +++ b/sys/dev/pci/drm/drm_atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_atomic.h,v 1.14 2016/04/05 08:17:34 kettenis Exp $ */ +/* $OpenBSD: drm_atomic.h,v 1.15 2017/01/24 02:28:17 visa Exp $ */ /** * \file drm_atomic.h * Atomic operations used in the DRM which may or may not be provided by the OS. @@ -30,7 +30,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include <machine/atomic.h> +#include <sys/atomic.h> typedef uint32_t atomic_t; diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c index ea9032422cd..749b6618395 100644 --- a/sys/dev/pci/qle.c +++ b/sys/dev/pci/qle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qle.c,v 1.38 2015/09/11 10:19:05 jmatthew Exp $ */ +/* $OpenBSD: qle.c,v 1.39 2017/01/24 02:28:17 visa Exp $ */ /* * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org> @@ -20,13 +20,13 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/atomic.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/sensors.h> #include <sys/rwlock.h> #include <sys/task.h> -#include <machine/atomic.h> #include <machine/bus.h> #include <dev/pci/pcireg.h> diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 4aa3587f5f6..c85f68d889d 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.230 2017/01/24 00:58:55 mpi Exp $ */ +/* $OpenBSD: proc.h,v 1.231 2017/01/24 02:28:17 visa Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -41,6 +41,7 @@ #define _SYS_PROC_H_ #include <machine/proc.h> /* Machine-dependent proc substruct. */ +#include <sys/atomic.h> #include <sys/selinfo.h> /* For struct selinfo */ #include <sys/syslimits.h> /* For LOGIN_NAME_MAX */ #include <sys/queue.h> @@ -48,7 +49,6 @@ #include <sys/event.h> /* For struct klist */ #include <sys/mutex.h> /* For struct mutex */ #include <sys/resource.h> /* For struct rusage */ -#include <machine/atomic.h> #ifdef _KERNEL #define __need_process |