Date: Wed, 7 Sep 2016 18:53:46 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <201609071853.u87Irkre024958@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609071853.u87Irkre024958>