Define __OS_HAS_AGP in a more portable way
ClosedPublic
Actions

Authored by dim on Sep 3 2016, 11:19 AM.

Details

Reviewers

dumbbell
emaste

Commits

rS305554: MFC r305344:
rS305344: Define drmP.h's __OS_HAS_AGP and __OS_HAS_MTRR macros in a defined and

Summary

Building the kernel with clang 3.9.0 produces the following new warnings
in drm2:

In file included from sys/dev/drm2/radeon/radeon_agp.c:31:
sys/dev/drm2/drmP.h:1141:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]
#if __OS_HAS_AGP
    ^
sys/dev/drm2/drmP.h:106:23: note: expanded from macro '__OS_HAS_AGP'
#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
                      ^
sys/dev/drm2/drmP.h:1141:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]
sys/dev/drm2/drmP.h:106:47: note: expanded from macro '__OS_HAS_AGP'
#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
                                              ^

Instead of defining __OS_HAS_AGP in this way, use the more portable way
of:

#if <condition>
#define __OS_HAS_AGP 1
#else
#define __OS_HAS_AGP 0
#endif

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dim updated this revision to Diff 20011.Sep 3 2016, 11:19 AM

dim retitled this revision from to Define __OS_HAS_AGP in a more portable way.

dim updated this object.

dim edited the test plan for this revision. (Show Details)

dim added reviewers: dumbbell, emaste.

Herald added a subscriber: imp. · View Herald TranscriptSep 3 2016, 11:19 AM

Forgot to add that this also applies to __OS_HAS_MTRR, obviously.

Looks good to me. Thank you!

This revision is now accepted and ready to land.Sep 3 2016, 1:28 PM

We should also send this upstream (coordinating with the drm-next work) if it's still the same there

Closed by commit rS305344: Define drmP.h's __OS_HAS_AGP and __OS_HAS_MTRR macros in a defined and (authored by dim). · Explain WhySep 3 2016, 1:33 PM

This revision was automatically updated to reflect the committed changes.

In D7770#161258, @emaste wrote:

We should also send this upstream (coordinating with the drm-next work) if it's still the same there

I can't find __OS_HAS_AGP or __OS_HAS_MTRR defined anywhere in the drm-next-4.7 branch. However, __OS_HAS_AGP is used, but I don't remember the state of AGP support in drm-next.