Module Name: src
Committed By: dholland
Date: Sun Jan 27 05:08:05 UTC 2019
Modified Files:
src/sys/arch/x86/x86: spectre.c
Log Message:
fix duplicated chunk from merge
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/spectre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.23 src/sys/arch/x86/x86/spectre.c:1.24
--- src/sys/arch/x86/x86/spectre.c:1.23 Sun Jan 27 02:08:39 2019
+++ src/sys/arch/x86/x86/spectre.c Sun Jan 27 05:08:05 2019
@@ -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"