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

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

details:   https://anonhg.NetBSD.org/src/rev/79ad3a3bbda0
branches:  trunk
changeset: 447877:79ad3a3bbda0
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jan 27 05:08:05 2019 +0000

description:
fix duplicated chunk from merge

diffstat:

 sys/arch/x86/x86/spectre.c |  6 ++----
 sys/arch/xen/x86/xen_ipi.c |  8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diffs (44 lines):

diff -r 4d82c9ea070f -r 79ad3a3bbda0 sys/arch/x86/x86/spectre.c
--- a/sys/arch/x86/x86/spectre.c        Sun Jan 27 05:07:46 2019 +0000
+++ b/sys/arch/x86/x86/spectre.c        Sun Jan 27 05:08:05 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spectre.c,v 1.23 2019/01/27 02:08:39 pgoyette Exp $    */
+/*     $NetBSD: spectre.c,v 1.24 2019/01/27 05:08:05 dholland Exp $    */
 
 /*
  * Copyright (c) 2018 NetBSD Foundation, Inc.
@@ -34,9 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.23 2019/01/27 02:08:39 pgoyette Exp $");
-
-#include "opt_spectre.h"
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.24 2019/01/27 05:08:05 dholland Exp $");
 
 #include "opt_spectre.h"
 
diff -r 4d82c9ea070f -r 79ad3a3bbda0 sys/arch/xen/x86/xen_ipi.c
--- a/sys/arch/xen/x86/xen_ipi.c        Sun Jan 27 05:07:46 2019 +0000
+++ b/sys/arch/xen/x86/xen_ipi.c        Sun Jan 27 05:08:05 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.30 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -33,12 +33,10 @@
 
 /* 
  * Based on: x86/ipi.c
- * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.30 2019/01/27 02:08:39 pgoyette Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $");
  */
 
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.30 2019/01/27 02:08:39 pgoyette Exp $");
-
-#include "opt_ddb.h"
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $");
 
 #include "opt_ddb.h"