From 189ab46be65d21170885b017db8682b54525da6a Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Sat, 14 Mar 2015 07:33:43 +0000
Subject: add sys/atomic.h back for membar_* needed for at least armv7

---
 sys/kern/kern_fork.c   | 3 ++-
 sys/kern/kern_rwlock.c | 3 ++-
 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)
-- 
cgit v1.2.3