Module Name: src
Committed By: riastradh
Date: Mon Aug 27 05:57:29 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gpu_error.c
Log Message:
mild modifications to avoid needing more headers
Author: coypu <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.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/i915/i915_gpu_error.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.5 Mon Aug 27 04:58:23 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c Mon Aug 27 05:57:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gpu_error.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $ */
+/* $NetBSD: i915_gpu_error.c,v 1.6 2018/08/27 05:57:29 riastradh Exp $ */
/*
* Copyright (c) 2008 Intel Corporation
@@ -30,9 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.6 2018/08/27 05:57:29 riastradh Exp $");
+
+#include <sys/param.h>
-#include <generated/utsrelease.h>
#include <asm/io.h>
#include <linux/irqflags.h>
#include "i915_drv.h"
@@ -354,9 +355,9 @@ int i915_error_state_to_str(struct drm_i
err_printf(m, "%s\n", error->error_msg);
err_printf(m, "Time: %"PRIdMAX" s %ld us\n", (intmax_t)error->time.tv_sec,
(long)error->time.tv_usec);
-#ifndef __NetBSD__ /* XXX kernel version */
- err_printf(m, "Kernel: " UTS_RELEASE "\n");
-#endif
+ err_printf(m, "Kernel: " __NetBSD_Version__ "\n");
+ err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
+ error->time.tv_usec);
max_hangcheck_score = 0;
for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
if (error->ring[i].hangcheck_score > max_hangcheck_score)
