Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:53:13 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_drv.c
Log Message:
Fix drm_err merge.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/drm_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.2 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Mon Aug 27 06:53:13 2018
@@ -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 fa...@acm.org
@@ -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 @@ void drm_err(const char *format, ...)
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;
