SVN r345102 breaks drm-current-kmod

[Hans Petter Selasky]

CC'ing Johannes and Niclas.

--HPS

On 3/14/19 1:20 AM, Michael Butler wrote:
> As below ..
> 
> --- drm_atomic_helper.o ---
> In file included from
> /usr/ports/graphics/drm-current-kmod/work/kms-drm-78e51d0/drivers/gpu/drm/drm_atomic_helper.c:28:
> In file included from
> /usr/ports/graphics/drm-current-kmod/work/kms-drm-78e51d0/include/drm/drmP.h:139:
> /usr/ports/graphics/drm-current-kmod/work/kms-drm-78e51d0/drivers/gpu/drm/drm_os_freebsd.h:124:9:
> error: 'IS_ALIGNED' macro redefined [-Werror,-Wmacro-redefined]
> #define IS_ALIGNED(x, y)        (((x) & ((y) - 1)) == 0)
>          ^
> /usr/src/sys/compat/linuxkpi/common/include/linux/kernel.h:133:9: note:
> previous definition is here
> #define IS_ALIGNED(x, a)        (((x) & ((__typeof(x))(a) - 1)) == 0)
>          ^
> --- drm_atomic.o ---
> In file included from
> /usr/ports/graphics/drm-current-kmod/work/kms-drm-78e51d0/drivers/gpu/drm/drm_atomic.c:29:
> In file included from
> /usr/ports/graphics/drm-current-kmod/work/kms-drm-78e51d0/include/drm/drmP.h:139:
> /usr/ports/graphics/drm-current-kmod/work/kms-drm-78e51d0/drivers/gpu/drm/drm_os_freebsd.h:124:9:
> error: 'IS_ALIGNED' macro redefined [-Werror,-Wmacro-redefined]
> #define IS_ALIGNED(x, y)        (((x) & ((y) - 1)) == 0)
>          ^
> /usr/src/sys/compat/linuxkpi/common/include/linux/kernel.h:133:9: note:
> previous definition is here
> #define IS_ALIGNED(x, a)        (((x) & ((__typeof(x))(a) - 1)) == 0)
>          ^
> --- drm_atomic_helper.o ---
> 1 error generated.
> *** [drm_atomic_helper.o] Error code 1
> 
> make[3]: stopped in
> /usr/ports/graphics/drm-current-kmod/work/kms-drm-78e51d0/drm
>