Merge tag 'trace-v6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...

[linux-2.6-microblaze.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 4e9a7a9..937e967 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3173,6 +3173,9 @@ void __trace_stack(struct trace_array *tr, unsigned int trace_ctx,
                return;
        }
 
+       if (WARN_ON_ONCE(IS_ENABLED(CONFIG_GENERIC_ENTRY)))
+               return;
+
        /*
         * When an NMI triggers, RCU is enabled via ct_nmi_enter(),
         * but if the above rcu_is_watching() failed, then the NMI
@@ -5645,7 +5648,7 @@ static const char readme_msg[] =
 #ifdef CONFIG_HIST_TRIGGERS
        "\t           s:[synthetic/]<event> <field> [<field>]\n"
 #endif
-       "\t           e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]\n"
+       "\t           e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>] [if <filter>]\n"
        "\t           -:[<group>/][<event>]\n"
 #ifdef CONFIG_KPROBE_EVENTS
        "\t    place: [<module>:]<symbol>[+<offset>]|<memaddr>\n"
@@ -5662,7 +5665,7 @@ static const char readme_msg[] =
        "\t           $stack<index>, $stack, $retval, $comm,\n"
 #endif
        "\t           +|-[u]<offset>(<fetcharg>), \\imm-value, \\\"imm-string\"\n"
-       "\t     type: s8/16/32/64, u8/16/32/64, x8/16/32/64, string, symbol,\n"
+       "\t     type: s8/16/32/64, u8/16/32/64, x8/16/32/64, char, string, symbol,\n"
        "\t           b<bit-width>@<bit-offset>/<container-size>, ustring,\n"
        "\t           symstr, <type>\\[<array-size>\\]\n"
 #ifdef CONFIG_HIST_TRIGGERS
@@ -9195,9 +9198,6 @@ buffer_percent_write(struct file *filp, const char __user *ubuf,
        if (val > 100)
                return -EINVAL;
 
-       if (!val)
-               val = 1;
-
        tr->buffer_percent = val;
 
        (*ppos)++;