Merge tag 'linux-kselftest-4.13-rc1-update' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 00e2e4169b1e85216b7404b8eff7b1a3b1fc9418..948ec32e0c27f9197fda8ca500d584f259d5c217 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4564,7 +4564,8 @@ static const char readme_msg[] =
 #endif
 #if defined(CONFIG_KPROBE_EVENTS) || defined(CONFIG_UPROBE_EVENTS)
        "\t  accepts: event-definitions (one definition per line)\n"
-       "\t   Format: p|r[:[<group>/]<event>] <place> [<args>]\n"
+       "\t   Format: p[:[<group>/]<event>] <place> [<args>]\n"
+       "\t           r[maxactive][:[<group>/]<event>] <place> [<args>]\n"
        "\t           -:[<group>/]<event>\n"
 #ifdef CONFIG_KPROBE_EVENTS
        "\t    place: [<module>:]<symbol>[+<offset>]|<memaddr>\n"