Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index fe42b6ec3f0c..da796e2dc4f5 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -188,6 +188,13 @@ static int ddebug_change(const struct ddebug_query *query,
                         newflags = (dp->flags & mask) | flags;
                         if (newflags == dp->flags)
                                 continue;
+#ifdef HAVE_JUMP_LABEL
+                        if (dp->flags & _DPRINTK_FLAGS_PRINT) {
+                                if (!(flags & _DPRINTK_FLAGS_PRINT))
+                                        static_branch_disable(&dp->key.dd_key_true);
+                        } else if (flags & _DPRINTK_FLAGS_PRINT)
+                                static_branch_enable(&dp->key.dd_key_true);
+#endif
                         dp->flags = newflags;
                         vpr_info("changed %s:%d [%s]%s =%s\n",
                                  trim_prefix(dp->filename), dp->lineno,