Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm/dist/bsd-core fix build for 'no options...



details:   https://anonhg.NetBSD.org/src/rev/bc732552863d
branches:  trunk
changeset: 787219:bc732552863d
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Thu Jun 06 07:55:46 2013 +0000

description:
fix build for 'no options MTRR'

diffstat:

 sys/external/bsd/drm/dist/bsd-core/drm_memory.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 5e1d73f58165 -r bc732552863d sys/external/bsd/drm/dist/bsd-core/drm_memory.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_memory.c   Thu Jun 06 07:11:18 2013 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_memory.c   Thu Jun 06 07:55:46 2013 +0000
@@ -38,6 +38,7 @@
 
 #include "drmP.h"
 
+
 #if defined(__NetBSD__)
 # ifdef DRM_NO_AGP
 #  define NAGP_I810 0
@@ -56,6 +57,9 @@
 # if NGENFB > 0
 #  include <dev/wsfb/genfbvar.h>
 # endif
+# if defined(_KERNEL_OPT)
+#   include "opt_mtrr.h"
+# endif
 #endif
 
 MALLOC_DEFINE(DRM_MEM_DMA, "drm_dma", "DRM DMA Data Structures");
@@ -300,7 +304,7 @@
 int
 drm_mtrr_add(unsigned long offset, size_t size, int flags)
 {
-#ifdef MTRR_GETSET_KERNEL
+#if defined(MTRR) && defined(MTRR_GETSET_KERNEL)
        struct mtrr mtrrmap;
        int one = 1;
 
@@ -317,7 +321,7 @@
 int
 drm_mtrr_del(int __unused handle, unsigned long offset, size_t size, int flags)
 {
-#ifdef MTRR_GETSET_KERNEL
+#if defined(MTRR) && defined(MTRR_GETSET_KERNEL)
        struct mtrr mtrrmap;
        int one = 1;
 



Home | Main Index | Thread Index | Old Index