summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2015-03-14 07:33:43 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2015-03-14 07:33:43 +0000
commit189ab46be65d21170885b017db8682b54525da6a (patch)
tree5c10eb2e1fc586b82c259b23b1e193e1a6b301df
parent73a2bc179fc82fafccdc997035ce52e79800f1bf (diff)
add sys/atomic.h back for membar_* needed for at least armv7
-rw-r--r--sys/kern/kern_fork.c3
-rw-r--r--sys/kern/kern_rwlock.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 30c65f5ee1a..ec92be51948 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_fork.c,v 1.179 2015/03/14 03:38:50 jsg Exp $ */
+/* $OpenBSD: kern_fork.c,v 1.180 2015/03/14 07:33:42 jsg Exp $ */
/* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */
/*
@@ -57,6 +57,7 @@
#include <sys/pool.h>
#include <sys/mman.h>
#include <sys/ptrace.h>
+#include <sys/atomic.h>
#include <sys/unistd.h>
#include <sys/syscallargs.h>
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index ab75143ddc0..bdaee0c1ae7 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_rwlock.c,v 1.26 2015/03/14 03:38:50 jsg Exp $ */
+/* $OpenBSD: kern_rwlock.c,v 1.27 2015/03/14 07:33:42 jsg Exp $ */
/*
* Copyright (c) 2002, 2003 Artur Grabowski <art@openbsd.org>
@@ -22,6 +22,7 @@
#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/limits.h>
+#include <sys/atomic.h>
/* XXX - temporary measure until proc0 is properly aligned */
#define RW_PROC(p) (((long)p) & ~RWLOCK_MASK)