summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-08-27 06:42:12 +0000
committerjsg <jsg@openbsd.org>2020-08-27 06:42:12 +0000
commitf5af14d67ce2e9dfa1b3ac4670bcb11bfd09593b (patch)
treec1449906ebce5eb331d03f2133f25973472e6135
parenttweak previous; (diff)
downloadwireguard-openbsd-f5af14d67ce2e9dfa1b3ac4670bcb11bfd09593b.tar.xz
wireguard-openbsd-f5af14d67ce2e9dfa1b3ac4670bcb11bfd09593b.zip
bring back local #undef DEBUG changes lost in drm 5.7 update
fixes errors building with option DEBUG reported by phessler@
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c4
-rw-r--r--sys/dev/pci/drm/radeon/atom.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c
index ad42114257b..751fe647c8a 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c
@@ -94,6 +94,10 @@ static void debug_print_spaces(int n)
printk(" ");
}
+#ifdef DEBUG
+#undef DEBUG
+#endif
+
#define DEBUG(...) do if (amdgpu_atom_debug) { printk(KERN_DEBUG __VA_ARGS__); } while (0)
#define SDEBUG(...) do if (amdgpu_atom_debug) { printk(KERN_DEBUG); debug_print_spaces(debug_depth); printk(__VA_ARGS__); } while (0)
#else
diff --git a/sys/dev/pci/drm/radeon/atom.c b/sys/dev/pci/drm/radeon/atom.c
index f4852aea9ec..ec88b70f5b4 100644
--- a/sys/dev/pci/drm/radeon/atom.c
+++ b/sys/dev/pci/drm/radeon/atom.c
@@ -97,6 +97,10 @@ static void debug_print_spaces(int n)
printk(" ");
}
+#ifdef DEBUG
+#undef DEBUG
+#endif
+
#define DEBUG(...) do if (atom_debug) { printk(KERN_DEBUG __VA_ARGS__); } while (0)
#define SDEBUG(...) do if (atom_debug) { printk(KERN_DEBUG); debug_print_spaces(debug_depth); printk(__VA_ARGS__); } while (0)
#else