Module Name: src
Committed By: maxv
Date: Sat Oct 21 07:24:26 UTC 2017
Modified Files:
src/sys/compat/linux/arch/amd64: linux_machdep.c
src/sys/compat/linux32/arch/amd64: linux32_machdep.c
Log Message:
Include opt_user_ldt.h when needed.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/arch/amd64/linux_machdep.c
cvs rdiff -u -r1.42 -r1.43 \
src/sys/compat/linux32/arch/amd64/linux32_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/compat/linux/arch/amd64/linux_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.54 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.55
--- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.54 Thu Oct 19 10:01:09 2017
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c Sat Oct 21 07:24:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.54 2017/10/19 10:01:09 maxv Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.55 2017/10/21 07:24:26 maxv Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.54 2017/10/19 10:01:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.55 2017/10/21 07:24:26 maxv Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -57,8 +57,10 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
* To see whether wscons is configured (for virtual console ioctl calls).
*/
#if defined(_KERNEL_OPT)
+#include "opt_user_ldt.h"
#include "wsdisplay.h"
#endif
+
#if (NWSDISPLAY > 0)
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplay_usl_io.h>
Index: src/sys/compat/linux32/arch/amd64/linux32_machdep.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.42 src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.43
--- src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.42 Thu Oct 19 10:01:09 2017
+++ src/sys/compat/linux32/arch/amd64/linux32_machdep.c Sat Oct 21 07:24:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_machdep.c,v 1.42 2017/10/19 10:01:09 maxv Exp $ */
+/* $NetBSD: linux32_machdep.c,v 1.43 2017/10/21 07:24:26 maxv Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -31,7 +31,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.42 2017/10/19 10:01:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.43 2017/10/21 07:24:26 maxv Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_user_ldt.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
