[src/trunk]: src G/C arm/atomic.h

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e1ef44c9ae18
branches:  trunk
changeset: 944316:e1ef44c9ae18
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Sep 26 10:06:25 2020 +0000

description:
G/C arm/atomic.h

diffstat:

 distrib/sets/lists/comp/ad.aarch64  |   4 ++--
 distrib/sets/lists/comp/ad.arm      |   4 ++--
 sys/arch/acorn32/include/atomic.h   |   1 -
 sys/arch/amigappc/include/atomic.h  |   3 ---
 sys/arch/arm/cortex/gic.c           |   5 ++---
 sys/arch/arm/gemini/gemini_icu.c    |   5 ++---
 sys/arch/arm/include/Makefile       |   4 ++--
 sys/arch/arm/include/atomic.h       |  35 -----------------------------------
 sys/arch/arm/omap/omap2_icu.c       |   5 ++---
 sys/arch/arm/omap/omapl1x_aintc.c   |   3 +--
 sys/arch/arm/ti/ti_omapintc.c       |   5 ++---
 sys/arch/cats/include/atomic.h      |   1 -
 sys/arch/epoc32/include/atomic.h    |   3 ---
 sys/arch/evbarm/include/atomic.h    |   3 ---
 sys/arch/hpcarm/include/atomic.h    |   1 -
 sys/arch/iyonix/include/atomic.h    |   3 ---
 sys/arch/netwinder/include/atomic.h |   1 -
 sys/arch/shark/include/atomic.h     |   1 -
 sys/arch/zaurus/include/atomic.h    |   3 ---
 19 files changed, 15 insertions(+), 75 deletions(-)

diffs (273 lines):

diff -r a5ddb87d4246 -r e1ef44c9ae18 distrib/sets/lists/comp/ad.aarch64
--- a/distrib/sets/lists/comp/ad.aarch64        Sat Sep 26 08:21:27 2020 +0000
+++ b/distrib/sets/lists/comp/ad.aarch64        Sat Sep 26 10:06:25 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.43 2020/09/06 10:54:26 mrg Exp $
+# $NetBSD: ad.aarch64,v 1.44 2020/09/26 10:06:25 skrll Exp $
 ./usr/include/aarch64                          comp-c-include
 ./usr/include/aarch64/ansi.h                   comp-c-include
 ./usr/include/aarch64/aout_machdep.h           comp-c-include
@@ -67,7 +67,7 @@
 ./usr/include/arm/arm32/vmparam.h              comp-c-include
 ./usr/include/arm/armreg.h                     comp-c-include
 ./usr/include/arm/asm.h                                comp-c-include
-./usr/include/arm/atomic.h                     comp-c-include
+./usr/include/arm/atomic.h                     comp-c-include          obsolete
 ./usr/include/arm/bswap.h                      comp-c-include
 ./usr/include/arm/byte_swap.h                  comp-c-include
 ./usr/include/arm/cdefs.h                      comp-c-include
diff -r a5ddb87d4246 -r e1ef44c9ae18 distrib/sets/lists/comp/ad.arm
--- a/distrib/sets/lists/comp/ad.arm    Sat Sep 26 08:21:27 2020 +0000
+++ b/distrib/sets/lists/comp/ad.arm    Sat Sep 26 10:06:25 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.103 2020/09/06 10:54:26 mrg Exp $
+# $NetBSD: ad.arm,v 1.104 2020/09/26 10:06:25 skrll Exp $
 ./usr/bin/elf2aout                             comp-sysutil-bin
 ./usr/include/acorn26                          comp-obsolete           obsolete
 ./usr/include/acorn26/ansi.h                   comp-obsolete           obsolete
@@ -127,7 +127,7 @@
 ./usr/include/arm/arm32/vmparam.h              comp-c-include
 ./usr/include/arm/armreg.h                     comp-c-include
 ./usr/include/arm/asm.h                                comp-c-include
-./usr/include/arm/atomic.h                     comp-c-include
+./usr/include/arm/atomic.h                     comp-c-include          obsolete
 ./usr/include/arm/bswap.h                      comp-c-include
 ./usr/include/arm/bus.h                                comp-obsolete           obsolete
 ./usr/include/arm/byte_swap.h                  comp-c-include
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/acorn32/include/atomic.h
--- a/sys/arch/acorn32/include/atomic.h Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/amigappc/include/atomic.h
--- a/sys/arch/amigappc/include/atomic.h        Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: atomic.h,v 1.1 2009/07/21 09:49:15 phx Exp $   */
-
-#include <powerpc/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/arm/cortex/gic.c
--- a/sys/arch/arm/cortex/gic.c Sat Sep 26 08:21:27 2020 +0000
+++ b/sys/arch/arm/cortex/gic.c Sat Sep 26 10:06:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gic.c,v 1.41 2020/07/27 18:36:23 jmcneill Exp $        */
+/*     $NetBSD: gic.c,v 1.42 2020/09/26 10:06:25 skrll Exp $   */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.41 2020/07/27 18:36:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.42 2020/09/26 10:06:25 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -46,7 +46,6 @@
 #include <sys/atomic.h>
 
 #include <arm/armreg.h>
-#include <arm/atomic.h>
 #include <arm/cpufunc.h>
 #include <arm/locore.h>
 
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/arm/gemini/gemini_icu.c
--- a/sys/arch/arm/gemini/gemini_icu.c  Sat Sep 26 08:21:27 2020 +0000
+++ b/sys/arch/arm/gemini/gemini_icu.c  Sat Sep 26 10:06:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gemini_icu.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $    */
+/*     $NetBSD: gemini_icu.c,v 1.6 2020/09/26 10:06:25 skrll Exp $     */
 
 /* adapted from:
  *     NetBSD: omap2_icu.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -36,7 +36,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_icu.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_icu.c,v 1.6 2020/09/26 10:06:25 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -49,7 +49,6 @@
 #include <arm/cpu.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
-#include <arm/atomic.h>
 
 #include <arm/pic/picvar.h>
 
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/arm/include/Makefile
--- a/sys/arch/arm/include/Makefile     Sat Sep 26 08:21:27 2020 +0000
+++ b/sys/arch/arm/include/Makefile     Sat Sep 26 10:06:25 2020 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.51 2018/07/12 10:46:42 maxv Exp $
+#      $NetBSD: Makefile,v 1.52 2020/09/26 10:06:26 skrll Exp $
 
 INCSDIR= /usr/include/arm
 
-INCS=  aeabi.h ansi.h aout_machdep.h apmvar.h armreg.h asm.h atomic.h \
+INCS=  aeabi.h ansi.h aout_machdep.h apmvar.h armreg.h asm.h \
        bswap.h byte_swap.h \
        cdefs.h cpu.h cpuconf.h cputypes.h \
        disklabel.h \
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/arm/include/atomic.h
--- a/sys/arch/arm/include/atomic.h     Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/* $NetBSD: atomic.h,v 1.11 2008/11/19 06:39:17 matt Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas <matt%3am-software.com@localhost>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef        _ARM_ATOMIC_H_
-#define        _ARM_ATOMIC_H_
-
-#endif /* _ARM_ATOMIC_H_ */
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/arm/omap/omap2_icu.c
--- a/sys/arch/arm/omap/omap2_icu.c     Sat Sep 26 08:21:27 2020 +0000
+++ b/sys/arch/arm/omap/omap2_icu.c     Sat Sep 26 10:06:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $  */
+/*     $NetBSD: omap2_icu.c,v 1.11 2020/09/26 10:06:26 skrll Exp $     */
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -30,7 +30,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.11 2020/09/26 10:06:26 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -44,7 +44,6 @@
 #include <arm/cpu.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
-#include <arm/atomic.h>
 
 #include <arm/omap/omap2_reg.h>
 #include <arm/omap/omap2_obiovar.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/arm/omap/omapl1x_aintc.c
--- a/sys/arch/arm/omap/omapl1x_aintc.c Sat Sep 26 08:21:27 2020 +0000
+++ b/sys/arch/arm/omap/omapl1x_aintc.c Sat Sep 26 10:06:25 2020 +0000
@@ -25,7 +25,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_aintc.c,v 1.1 2013/10/02 16:48:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_aintc.c,v 1.2 2020/09/26 10:06:26 skrll Exp $");
 
 #include "opt_omapl1x.h"
 
@@ -43,7 +43,6 @@
 #include <arm/cpu.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
-#include <arm/atomic.h>
 
 #include <arm/omap/omapl1x_reg.h>
 #include <arm/omap/omap_tipb.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/arm/ti/ti_omapintc.c
--- a/sys/arch/arm/ti/ti_omapintc.c     Sat Sep 26 08:21:27 2020 +0000
+++ b/sys/arch/arm/ti/ti_omapintc.c     Sat Sep 26 10:06:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ti_omapintc.c,v 1.2 2019/10/29 22:19:13 jmcneill Exp $ */
+/*     $NetBSD: ti_omapintc.c,v 1.3 2020/09/26 10:06:26 skrll Exp $    */
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -29,7 +29,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.2 2019/10/29 22:19:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.3 2020/09/26 10:06:26 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -44,7 +44,6 @@
 #include <arm/cpu.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
-#include <arm/atomic.h>
 
 #include <dev/fdt/fdtvar.h>
 
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/cats/include/atomic.h
--- a/sys/arch/cats/include/atomic.h    Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/epoc32/include/atomic.h
--- a/sys/arch/epoc32/include/atomic.h  Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: atomic.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $      */
-
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/evbarm/include/atomic.h
--- a/sys/arch/evbarm/include/atomic.h  Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: atomic.h,v 1.2 2018/03/03 15:59:46 skrll Exp $ */
-
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/hpcarm/include/atomic.h
--- a/sys/arch/hpcarm/include/atomic.h  Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/iyonix/include/atomic.h
--- a/sys/arch/iyonix/include/atomic.h  Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: atomic.h,v 1.2 2005/12/11 12:17:51 christos Exp $      */
-
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/netwinder/include/atomic.h
--- a/sys/arch/netwinder/include/atomic.h       Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/shark/include/atomic.h
--- a/sys/arch/shark/include/atomic.h   Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include <arm/atomic.h>
diff -r a5ddb87d4246 -r e1ef44c9ae18 sys/arch/zaurus/include/atomic.h
--- a/sys/arch/zaurus/include/atomic.h  Sat Sep 26 08:21:27 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: atomic.h,v 1.1 2006/12/16 05:43:06 ober Exp $  */
-
-#include <arm/atomic.h>