From owner-svn-src-all@freebsd.org  Wed Sep  7 18:53:47 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6656BCF304;
 Wed,  7 Sep 2016 18:53:47 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A6F3A1CE3;
 Wed,  7 Sep 2016 18:53:47 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87Irkg0024959;
 Wed, 7 Sep 2016 18:53:46 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87Irkre024958;
 Wed, 7 Sep 2016 18:53:46 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201609071853.u87Irkre024958@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 7 Sep 2016 18:53:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r305554 - in stable: 10/sys/dev/drm2 11/sys/dev/drm2
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2016 18:53:47 -0000

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/11/sys/dev/drm2/drmP.h
Directory Properties:
  stable/11/   (props changed)

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

Modified: stable/11/sys/dev/drm2/drmP.h
==============================================================================
--- stable/11/sys/dev/drm2/drmP.h	Wed Sep  7 18:33:18 2016	(r305553)
+++ stable/11/sys/dev/drm2/drmP.h	Wed Sep  7 18:53:46 2016	(r305554)
@@ -103,8 +103,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;