[src/trunk]: src/sys/external/bsd/drm2/drm directly include asm/bug.h for WAR...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9f91ae716737
branches:  trunk
changeset: 992416:9f91ae716737
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:17:52 2018 +0000

description:
directly include asm/bug.h for WARN_ON instead of fighting
to match side-loading.

include drm_legacy.h as needed


Author: coypu <coypu%sdf.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h |  3 ++-
 sys/external/bsd/drm2/drm/drm_drv.c                       |  5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 2ca7915f7a7c -r 9f91ae716737 sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h Mon Aug 27 06:17:40 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h Mon Aug 27 06:17:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_modeset_lock.h,v 1.2 2018/08/27 04:58:38 riastradh Exp $   */
+/*     $NetBSD: drm_modeset_lock.h,v 1.3 2018/08/27 06:17:52 riastradh Exp $   */
 
 /*
  * Copyright (C) 2014 Red Hat
@@ -27,6 +27,7 @@
 #define DRM_MODESET_LOCK_H_
 
 #include <linux/ww_mutex.h>
+#include <asm/bug.h>
 
 struct drm_modeset_lock;
 
diff -r 2ca7915f7a7c -r 9f91ae716737 sys/external/bsd/drm2/drm/drm_drv.c
--- a/sys/external/bsd/drm2/drm/drm_drv.c       Mon Aug 27 06:17:40 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm_drv.c       Mon Aug 27 06:17:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.20 2017/12/05 19:13:52 jmcneill Exp $    */
+/*     $NetBSD: drm_drv.c,v 1.21 2018/08/27 06:17:52 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.20 2017/12/05 19:13:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.21 2018/08/27 06:17:52 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -58,6 +58,7 @@
 #include <linux/pm.h>
 
 #include <drm/drmP.h>
+#include "../dist/drm/drm_legacy.h"
 
 static dev_type_open(drm_open);