[src/trunk]: src/sys/external/bsd/drm2/dist/drm Fix drm_err merge.

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

details:   https://anonhg.NetBSD.org/src/rev/293ae5844366
branches:  trunk
changeset: 834904:293ae5844366
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:53:13 2018 +0000

description:
Fix drm_err merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_drv.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 89aa5f3da4b4 -r 293ae5844366 sys/external/bsd/drm2/dist/drm/drm_drv.c
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c  Mon Aug 27 06:52:58 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c  Mon Aug 27 06:53:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.2 2018/08/27 04:58:19 riastradh Exp $    */
+/*     $NetBSD: drm_drv.c,v 1.3 2018/08/27 06:53:13 riastradh Exp $    */
 
 /*
  * Created: Fri Jan 19 10:48:35 2001 by faith%acm.org@localhost
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.2 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.3 2018/08/27 06:53:13 riastradh Exp $");
 
 #include <linux/err.h>
 #include <linux/export.h>
@@ -75,11 +75,11 @@
        va_list args;
 
        va_start(args, format);
-       printf("DRM error in %s: ", func);
+       /* XXX Convert this to a symbol name...  */
+       printf(KERN_ERR "[" DRM_NAME ":%p] *ERROR* ",
+           __builtin_return_address(0));
        vprintf(format, args);
        va_end(args);
-
-       return 0;
 #else
        struct va_format vaf;
        va_list args;