Module Name:    src
Committed By:   maxv
Date:           Thu Aug 10 12:49:11 UTC 2017

Modified Files:
        src/sys/arch/amd64/amd64: locore.S
        src/sys/arch/i386/i386: compat_16_machdep.c machdep.c

Log Message:
Don't include opt_compat_ibcs2.h. No idea what it was doing in amd64,
since it never got implemented there.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/i386/compat_16_machdep.c
cvs rdiff -u -r1.787 -r1.788 src/sys/arch/i386/i386/machdep.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/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.125 src/sys/arch/amd64/amd64/locore.S:1.126
--- src/sys/arch/amd64/amd64/locore.S:1.125	Tue Aug  8 17:00:42 2017
+++ src/sys/arch/amd64/amd64/locore.S	Thu Aug 10 12:49:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.125 2017/08/08 17:00:42 maxv Exp $	*/
+/*	$NetBSD: locore.S,v 1.126 2017/08/10 12:49:11 maxv Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -158,7 +158,6 @@
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_netbsd32.h"
-#include "opt_compat_ibcs2.h"
 #include "opt_xen.h"
 
 #include "assym.h"

Index: src/sys/arch/i386/i386/compat_16_machdep.c
diff -u src/sys/arch/i386/i386/compat_16_machdep.c:1.27 src/sys/arch/i386/i386/compat_16_machdep.c:1.28
--- src/sys/arch/i386/i386/compat_16_machdep.c:1.27	Wed Aug  9 18:45:30 2017
+++ src/sys/arch/i386/i386/compat_16_machdep.c	Thu Aug 10 12:49:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_16_machdep.c,v 1.27 2017/08/09 18:45:30 maxv Exp $	*/
+/*	$NetBSD: compat_16_machdep.c,v 1.28 2017/08/10 12:49:11 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.27 2017/08/09 18:45:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.28 2017/08/10 12:49:11 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_vm86.h"
 #include "opt_compat_netbsd.h"
-#include "opt_compat_ibcs2.h"
 #endif
 
 #include <sys/param.h>

Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.787 src/sys/arch/i386/i386/machdep.c:1.788
--- src/sys/arch/i386/i386/machdep.c:1.787	Sat Jul 29 11:54:14 2017
+++ src/sys/arch/i386/i386/machdep.c	Thu Aug 10 12:49:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.787 2017/07/29 11:54:14 maxv Exp $	*/
+/*	$NetBSD: machdep.c,v 1.788 2017/08/10 12:49:11 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,10 +67,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.787 2017/07/29 11:54:14 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.788 2017/08/10 12:49:11 maxv Exp $");
 
 #include "opt_beep.h"
-#include "opt_compat_ibcs2.h"
 #include "opt_compat_freebsd.h"
 #include "opt_compat_netbsd.h"
 #include "opt_cpureset_delay.h"

Reply via email to