svn commit: r305554 - in stable: 10/sys/dev/drm2 11/sys/dev/drm2

[Dimitry Andric]

Author: dim
Date: Wed Sep  7 18:53:46 2016
New Revision: 305554
URL: https://svnweb.freebsd.org/changeset/base/305554

Log:
  MFC r305344:
  
  Define drmP.h's __OS_HAS_AGP and __OS_HAS_MTRR macros in a defined and
  portable way.
  
  Reviewed by:	dumbbell
  Differential Revision: https://reviews.freebsd.org/D7770

Modified:
  stable/10/sys/dev/drm2/drmP.h
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/dev/drm2/drmP.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/dev/drm2/drmP.h
==============================================================================
--- stable/10/sys/dev/drm2/drmP.h	Wed Sep  7 18:33:18 2016	(r305553)
+++ stable/10/sys/dev/drm2/drmP.h	Wed Sep  7 18:53:46 2016	(r305554)
@@ -105,8 +105,16 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/drm2/drm_os_freebsd.h>
 
-#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
-#define __OS_HAS_MTRR (defined(CONFIG_MTRR))
+#if defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))
+#define __OS_HAS_AGP 1
+#else
+#define __OS_HAS_AGP 0
+#endif
+#if defined(CONFIG_MTRR)
+#define __OS_HAS_MTRR 1
+#else
+#define __OS_HAS_MTRR 0
+#endif
 
 struct drm_file;
 struct drm_device;