[src/trunk]: src/sys/arch fix duplicated chunk from merge

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

details:   https://anonhg.NetBSD.org/src/rev/9d1e1504e7ba
branches:  trunk
changeset: 996275:9d1e1504e7ba
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jan 27 04:49:12 2019 +0000

description:
fix duplicated chunk from merge

diffstat:

 sys/arch/aarch64/aarch64/trap.c        |   7 ++-----
 sys/arch/arm/include/asm.h             |  31 +------------------------------
 sys/arch/arm/samsung/exynos_platform.c |   9 ++-------
 sys/arch/i386/stand/Makefile.inc       |   7 +------
 sys/arch/i386/stand/genprom/Makefile   |   4 +---
 sys/arch/i386/stand/misc/Makefile      |   4 +---
 sys/arch/macppc/stand/bootxx/Makefile  |   6 +-----
 7 files changed, 9 insertions(+), 59 deletions(-)

diffs (131 lines):

diff -r dd84018720ef -r 9d1e1504e7ba sys/arch/aarch64/aarch64/trap.c
--- a/sys/arch/aarch64/aarch64/trap.c   Sun Jan 27 04:48:09 2019 +0000
+++ b/sys/arch/aarch64/aarch64/trap.c   Sun Jan 27 04:49:12 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.15 2019/01/27 02:08:36 pgoyette Exp $ */
+/* $NetBSD: trap.c,v 1.16 2019/01/27 04:49:12 dholland Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,10 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.15 2019/01/27 02:08:36 pgoyette Exp $");
-
-#include "opt_arm_intr_impl.h"
-#include "opt_compat_netbsd32.h"
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.16 2019/01/27 04:49:12 dholland Exp $");
 
 #include "opt_arm_intr_impl.h"
 #include "opt_compat_netbsd32.h"
diff -r dd84018720ef -r 9d1e1504e7ba sys/arch/arm/include/asm.h
--- a/sys/arch/arm/include/asm.h        Sun Jan 27 04:48:09 2019 +0000
+++ b/sys/arch/arm/include/asm.h        Sun Jan 27 04:49:12 2019 +0000
@@ -1,33 +1,4 @@
-/*     $NetBSD: asm.h,v 1.29 2019/01/27 02:08:37 pgoyette Exp $        */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * 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.
- */
+/*     $NetBSD: asm.h,v 1.30 2019/01/27 04:52:07 dholland Exp $        */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
diff -r dd84018720ef -r 9d1e1504e7ba sys/arch/arm/samsung/exynos_platform.c
--- a/sys/arch/arm/samsung/exynos_platform.c    Sun Jan 27 04:48:09 2019 +0000
+++ b/sys/arch/arm/samsung/exynos_platform.c    Sun Jan 27 04:49:12 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.23 2019/01/27 02:08:37 pgoyette Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.24 2019/01/27 04:53:59 dholland Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -35,12 +35,7 @@
 #include "ukbd.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.23 2019/01/27 02:08:37 pgoyette Exp $");
-
-/* XXXJDM
- * Booting a CA7 core on Exynos5422 is currently broken, disable starting CA7 secondaries.
- */
-#define        EXYNOS5422_DISABLE_CA7_CLUSTER
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.24 2019/01/27 04:53:59 dholland Exp $");
 
 /* XXXJDM
  * Booting a CA7 core on Exynos5422 is currently broken, disable starting CA7 secondaries.
diff -r dd84018720ef -r 9d1e1504e7ba sys/arch/i386/stand/Makefile.inc
--- a/sys/arch/i386/stand/Makefile.inc  Sun Jan 27 04:48:09 2019 +0000
+++ b/sys/arch/i386/stand/Makefile.inc  Sun Jan 27 04:49:12 2019 +0000
@@ -1,9 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.17 2019/01/27 02:08:38 pgoyette Exp $
-
-NOLIBCSANITIZER=
-NOSANITIZER=
-NOPIE=
-NOMAN=
+#      $NetBSD: Makefile.inc,v 1.18 2019/01/27 04:56:46 dholland Exp $
 
 NOLIBCSANITIZER=
 NOSANITIZER=
diff -r dd84018720ef -r 9d1e1504e7ba sys/arch/i386/stand/genprom/Makefile
--- a/sys/arch/i386/stand/genprom/Makefile      Sun Jan 27 04:48:09 2019 +0000
+++ b/sys/arch/i386/stand/genprom/Makefile      Sun Jan 27 04:49:12 2019 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2019/01/27 02:08:38 pgoyette Exp $
-
-.include <bsd.hostinit.mk>
+#      $NetBSD: Makefile,v 1.10 2019/01/27 04:56:46 dholland Exp $
 
 .include <bsd.hostinit.mk>
 
diff -r dd84018720ef -r 9d1e1504e7ba sys/arch/i386/stand/misc/Makefile
--- a/sys/arch/i386/stand/misc/Makefile Sun Jan 27 04:48:09 2019 +0000
+++ b/sys/arch/i386/stand/misc/Makefile Sun Jan 27 04:49:12 2019 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2019/01/27 02:08:38 pgoyette Exp $
-
-.include <bsd.hostinit.mk>
+#      $NetBSD: Makefile,v 1.11 2019/01/27 04:56:46 dholland Exp $
 
 .include <bsd.hostinit.mk>
 
diff -r dd84018720ef -r 9d1e1504e7ba sys/arch/macppc/stand/bootxx/Makefile
--- a/sys/arch/macppc/stand/bootxx/Makefile     Sun Jan 27 04:48:09 2019 +0000
+++ b/sys/arch/macppc/stand/bootxx/Makefile     Sun Jan 27 04:49:12 2019 +0000
@@ -1,8 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2019/01/27 02:08:38 pgoyette Exp $
-
-NOLIBCSANITIZER=
-NOSANITIZER=
-NOPIE=
+#      $NetBSD: Makefile,v 1.21 2019/01/27 04:59:12 dholland Exp $
 
 NOLIBCSANITIZER=
 NOSANITIZER=