Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:04:08 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_print.c
Log Message:
drm: ksyms_getname is forbidden in interrupt context.
For now, just avoid nice pretty symbol output in interrupt handlers.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/drm_print.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_print.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.9 src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.9 Sun Dec 19 11:46:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_print.c Sun Dec 19 12:04:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_print.c,v 1.9 2021/12/19 11:46:00 riastradh Exp $ */
+/* $NetBSD: drm_print.c,v 1.10 2021/12/19 12:04:08 riastradh Exp $ */
/*
* Copyright (C) 2016 Red Hat
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.9 2021/12/19 11:46:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.10 2021/12/19 12:04:08 riastradh Exp $");
#ifndef __NetBSD__ /* XXX ??? */
#define DEBUG /* for pr_debug() */
@@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_print.c,
#ifdef __NetBSD__
#include <sys/param.h>
#include <sys/stdarg.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/ksyms.h>
#else
@@ -78,7 +79,8 @@ drm_symstr(vaddr_t val, char *out, size_
const char *mod;
const char *sym;
- if (ksyms_getname(&mod, &sym, val, KSYMS_PROC|KSYMS_CLOSEST) == 0) {
+ if (!cpu_intr_p() &&
+ ksyms_getname(&mod, &sym, val, KSYMS_PROC|KSYMS_CLOSEST) == 0) {
char offset[32];
if (ksyms_getval(mod, sym, &naddr, KSYMS_ANY) == 0 &&
