[src/trunk]: src/sys/external/bsd/drm2/dist/drm drm: ksyms_getname is forbidd...

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

details:   https://anonhg.NetBSD.org/src/rev/547d5cf541fa
branches:  trunk
changeset: 1028802:547d5cf541fa
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:04:17 2021 +0000

description:
drm: ksyms_getname is forbidden while holding spin locks.

This is a kludgey workaround; should rethink this!

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_print.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 23d305ba431c -r 547d5cf541fa sys/external/bsd/drm2/dist/drm/drm_print.c
--- a/sys/external/bsd/drm2/dist/drm/drm_print.c        Sun Dec 19 12:04:08 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_print.c        Sun Dec 19 12:04:17 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_print.c,v 1.10 2021/12/19 12:04:08 riastradh Exp $ */
+/*     $NetBSD: drm_print.c,v 1.11 2021/12/19 12:04:17 riastradh Exp $ */
 
 /*
  * Copyright (C) 2016 Red Hat
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.10 2021/12/19 12:04:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.11 2021/12/19 12:04:17 riastradh Exp $");
 
 #ifndef __NetBSD__             /* XXX ??? */
 #define DEBUG /* for pr_debug() */
@@ -79,7 +79,8 @@
        const char *mod;
        const char *sym;
 
-       if (!cpu_intr_p() &&
+       if (curcpu()->ci_spin_locks == 0 &&
+           !cpu_intr_p() &&
            ksyms_getname(&mod, &sym, val, KSYMS_PROC|KSYMS_CLOSEST) == 0) {
                char offset[32];