config GCOV_PROFILE_FTRACE
        bool "Enable GCOV profiling on ftrace subsystem"
        depends on GCOV_KERNEL

@@ -789,4 +810,3 @@ config GCOV_PROFILE_FTRACE
 endif # FTRACE

 endif # TRACING_SUPPORT
-

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index bf6f1d70484d..018cbbefb769 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c

@@ -73,6 +73,11 @@ struct trace_iterator *tracepoint_print_iter;
 int tracepoint_printk;
 static DEFINE_STATIC_KEY_FALSE(tracepoint_printk_key);

+/* Pipe tracepoints to pstore */
+struct trace_iterator *tracepoint_pstore_iter;
+int tracepoint_pstore;
+static DEFINE_STATIC_KEY_FALSE(tracepoint_pstore_key);
+
 /* For tracers that don't implement custom flags */
 static struct tracer_opt dummy_tracer_opt[] = {
        { }

@@ -238,6 +243,14 @@ static int __init set_tracepoint_printk(char *str)
 }
 __setup("tp_printk", set_tracepoint_printk);

+static int __init set_tracepoint_pstore(char *str)
+{
+       if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0))
+               tracepoint_pstore = 1;
+       return 1;
+}
+__setup("tp_pstore", set_tracepoint_pstore);
+
 unsigned long long ns2usecs(u64 nsec)
 {
        nsec += 500;

@@ -2376,11 +2389,45 @@ int tracepoint_printk_sysctl(struct ctl_table *table, int write,
        return ret;
 }

+static DEFINE_MUTEX(tracepoint_pstore_mutex);
+
+int tracepoint_pstore_sysctl(struct ctl_table *table, int write,
+                            void __user *buffer, size_t *lenp,
+                            loff_t *ppos)
+{
+       int save_tracepoint_pstore;
+       int ret;
+
+       mutex_lock(&tracepoint_pstore_mutex);
+       save_tracepoint_pstore = tracepoint_pstore;
+
+       ret = proc_dointvec(table, write, buffer, lenp, ppos);
+
+       if (!tracepoint_pstore_iter)
+               tracepoint_pstore = 0;
+
+       if (save_tracepoint_pstore == tracepoint_pstore)
+               goto out;
+
+       if (tracepoint_pstore)
+               static_key_enable(&tracepoint_pstore_key.key);
+       else
+               static_key_disable(&tracepoint_pstore_key.key);
+
+ out:
+       mutex_unlock(&tracepoint_pstore_mutex);
+
+       return ret;
+}
+
 void trace_event_buffer_commit(struct trace_event_buffer *fbuffer)
 {
        if (static_key_false(&tracepoint_printk_key.key))
                output_printk(fbuffer);

+       if (static_key_false(&tracepoint_pstore_key.key))
+               pstore_event_call(fbuffer);