Module Name: src Committed By: riastradh Date: Mon Aug 27 07:50:08 UTC 2018
Modified Files: src/sys/external/bsd/drm2/include/drm: drm_os_netbsd.h Log Message: Define CONFIG_MTRR and CONFIG_X86_PAT. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h diff -u src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.8 src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.9 --- src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.8 Mon Aug 27 06:42:54 2018 +++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Mon Aug 27 07:50:08 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_os_netbsd.h,v 1.8 2018/08/27 06:42:54 riastradh Exp $ */ +/* $NetBSD: drm_os_netbsd.h,v 1.9 2018/08/27 07:50:08 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -36,12 +36,9 @@ #include "opt_drmkms.h" #endif -/* - * XXX Better to get rid of CONFIG_X86, but that's not convenient at - * the moment. - */ #if defined(__i386__) || defined(__x86_64__) #define CONFIG_X86 1 +#define CONFIG_X86_PAT 1 #endif #include "pci.h" @@ -57,6 +54,14 @@ #define CONFIG_PNP #endif +#if defined(_KERNEL_OPT) +#include "opt_mtrr.h" +#endif + +#ifdef MTRR +#define CONFIG_MTRR 1 +#endif + #include <drm/drm_agp_netbsd.h> #include <drm/drm_auth_netbsd.h> #include <drm/drm_copy_netbsd.h>