summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2017-01-31 07:44:56 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2017-01-31 07:44:56 +0000
commitc41c195af28a253d2f316d3c4428f0818520da88 (patch)
tree58b4d0ed1d3beb7c100dda05e5b5c5aa3ff2c404
parent4d75ba781299393d8cd5dd880caa808c168189a6 (diff)
Protect <sys/atomic.h> with #ifdef _KERNEL. This unbreaks userland
build on m88k, where the compiler has no notion of atomic built-ins. Suggested by miod@ OK mpi@
-rw-r--r--sys/sys/proc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index c85f68d889d..1a1f0966518 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.231 2017/01/24 02:28:17 visa Exp $ */
+/* $OpenBSD: proc.h,v 1.232 2017/01/31 07:44:55 visa Exp $ */
/* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */
/*-
@@ -41,7 +41,6 @@
#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>
@@ -51,6 +50,7 @@
#include <sys/resource.h> /* For struct rusage */
#ifdef _KERNEL
+#include <sys/atomic.h>
#define __need_process
#endif