]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Revert "tracing: Print nasty banner when trace_printk() is in use"
authorAvinash Repaka <avinash.repaka@oracle.com>
Thu, 2 Jun 2016 18:56:16 +0000 (11:56 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 10 Jun 2016 19:45:26 +0000 (12:45 -0700)
RDS uses trace_printk framework, hence disable trace_printk warning
banner.

Revert Details:

Revert "tracing: Remove newline from trace_printk warning banner"
This reverts commit 69a1c994cc540cc84469acf9952f72b899b38e8b.

Revert "kernel: trace: fix printk message"
This reverts commit eff264efeeb0898408e8c9df72d8a32621035bed.

Revert "tracing: Print nasty banner when trace_printk() is in use"
This reverts commit 2184db46e425c2b84a783eeead0e2b24ce67cd7f.

Orabug: 23510486

Signed-off-by: Avinash Repaka <avinash.repaka@oracle.com>
Acked-by: Srinivas Eeda <srinivas.eeda@oracle.com>
kernel/trace/trace.c

index 05330494a0dffde9824ab8659358e55a789ba286..d023887d241fa4955829b5b2ecae7381a46ea9fb 100644 (file)
@@ -2072,22 +2072,7 @@ void trace_printk_init_buffers(void)
        if (alloc_percpu_trace_buffer())
                return;
 
-       /* trace_printk() is for debug use only. Don't use it in production. */
-
-       pr_warning("\n");
-       pr_warning("**********************************************************\n");
-       pr_warning("**   NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE   **\n");
-       pr_warning("**                                                      **\n");
-       pr_warning("** trace_printk() being used. Allocating extra memory.  **\n");
-       pr_warning("**                                                      **\n");
-       pr_warning("** This means that this is a DEBUG kernel and it is     **\n");
-       pr_warning("** unsafe for production use.                           **\n");
-       pr_warning("**                                                      **\n");
-       pr_warning("** If you see this message and you are not debugging    **\n");
-       pr_warning("** the kernel, report this immediately to your vendor!  **\n");
-       pr_warning("**                                                      **\n");
-       pr_warning("**   NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE   **\n");
-       pr_warning("**********************************************************\n");
+       pr_info("ftrace: Allocated trace_printk buffers\n");
 
        /* Expand the buffers to set size */
        tracing_update_buffers();