7 files changed, 136 insertions, 29 deletions

diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index ab26f8aa3c78..5fc2dcdd21cd 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -7,6 +7,8 @@
 #include <linux/ktime.h>
 #include <linux/tracepoint.h>
 
+#define DAPM_DIRECT "(direct)"
+
 struct snd_soc_jack;
 struct snd_soc_codec;
 struct snd_soc_platform;
@@ -241,6 +243,84 @@ TRACE_EVENT(snd_soc_dapm_walk_done,
                   (int)__entry->path_checks, (int)__entry->neighbour_checks)
 );
 
+TRACE_EVENT(snd_soc_dapm_output_path,
+
+        TP_PROTO(struct snd_soc_dapm_widget *widget,
+                struct snd_soc_dapm_path *path),
+
+        TP_ARGS(widget, path),
+
+        TP_STRUCT__entry(
+                __string(       wname,  widget->name            )
+                __string(       pname,  path->name ? path->name : DAPM_DIRECT)
+                __string(       psname, path->sink->name        )
+                __field(        int,    path_sink               )
+                __field(        int,    path_connect            )
+        ),
+
+        TP_fast_assign(
+                __assign_str(wname, widget->name);
+                __assign_str(pname, path->name ? path->name : DAPM_DIRECT);
+                __assign_str(psname, path->sink->name);
+                __entry->path_connect = path->connect;
+                __entry->path_sink = (long)path->sink;
+        ),
+
+        TP_printk("%c%s -> %s -> %s\n",
+                (int) __entry->path_sink &&
+                (int) __entry->path_connect ? '*' : ' ',
+                __get_str(wname), __get_str(pname), __get_str(psname))
+);
+
+TRACE_EVENT(snd_soc_dapm_input_path,
+
+        TP_PROTO(struct snd_soc_dapm_widget *widget,
+                struct snd_soc_dapm_path *path),
+
+        TP_ARGS(widget, path),
+
+        TP_STRUCT__entry(
+                __string(       wname,  widget->name            )
+                __string(       pname,  path->name ? path->name : DAPM_DIRECT)
+                __string(       psname, path->source->name      )
+                __field(        int,    path_source             )
+                __field(        int,    path_connect            )
+        ),
+
+        TP_fast_assign(
+                __assign_str(wname, widget->name);
+                __assign_str(pname, path->name ? path->name : DAPM_DIRECT);
+                __assign_str(psname, path->source->name);
+                __entry->path_connect = path->connect;
+                __entry->path_source = (long)path->source;
+        ),
+
+        TP_printk("%c%s <- %s <- %s\n",
+                (int) __entry->path_source &&
+                (int) __entry->path_connect ? '*' : ' ',
+                __get_str(wname), __get_str(pname), __get_str(psname))
+);
+
+TRACE_EVENT(snd_soc_dapm_connected,
+
+        TP_PROTO(int paths, int stream),
+
+        TP_ARGS(paths, stream),
+
+        TP_STRUCT__entry(
+                __field(        int,    paths           )
+                __field(        int,    stream          )
+        ),
+
+        TP_fast_assign(
+                __entry->paths = paths;
+                __entry->stream = stream;
+        ),
+
+        TP_printk("%s: found %d paths\n",
+                __entry->stream ? "capture" : "playback", __entry->paths)
+);
+
 TRACE_EVENT(snd_soc_jack_irq,
 
         TP_PROTO(const char *name),
diff --git a/include/trace/events/ext3.h b/include/trace/events/ext3.h
index 7b53c0573dc9..15d11a39be47 100644
--- a/include/trace/events/ext3.h
+++ b/include/trace/events/ext3.h
@@ -24,8 +24,8 @@ TRACE_EVENT(ext3_free_inode,
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
-                __entry->uid    = inode->i_uid;
-                __entry->gid    = inode->i_gid;
+                __entry->uid    = i_uid_read(inode);
+                __entry->gid    = i_gid_read(inode);
                 __entry->blocks = inode->i_blocks;
         ),
 
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 319538bf17d2..69d8a69ea831 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -36,8 +36,8 @@ TRACE_EVENT(ext4_free_inode,
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
-                __entry->uid    = inode->i_uid;
-                __entry->gid    = inode->i_gid;
+                __entry->uid    = i_uid_read(inode);
+                __entry->gid    = i_gid_read(inode);
                 __entry->blocks = inode->i_blocks;
         ),
 
diff --git a/include/trace/events/jbd.h b/include/trace/events/jbd.h
index aff64d82d713..da6f2591c25e 100644
--- a/include/trace/events/jbd.h
+++ b/include/trace/events/jbd.h
@@ -36,19 +36,17 @@ DECLARE_EVENT_CLASS(jbd_commit,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
         ),
 
         TP_fast_assign(
                 __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->sync_commit = commit_transaction->t_synchronous_commit;
                 __entry->transaction    = commit_transaction->t_tid;
         ),
 
-        TP_printk("dev %d,%d transaction %d sync %d",
+        TP_printk("dev %d,%d transaction %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->transaction, __entry->sync_commit)
+                  __entry->transaction)
 );
 
 DEFINE_EVENT(jbd_commit, jbd_start_commit,
@@ -87,19 +85,17 @@ TRACE_EVENT(jbd_drop_transaction,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
         ),
 
         TP_fast_assign(
                 __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->sync_commit = commit_transaction->t_synchronous_commit;
                 __entry->transaction    = commit_transaction->t_tid;
         ),
 
-        TP_printk("dev %d,%d transaction %d sync %d",
+        TP_printk("dev %d,%d transaction %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->transaction, __entry->sync_commit)
+                  __entry->transaction)
 );
 
 TRACE_EVENT(jbd_end_commit,
@@ -109,21 +105,19 @@ TRACE_EVENT(jbd_end_commit,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
                 __field(        int,    head                    )
         ),
 
         TP_fast_assign(
                 __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->sync_commit = commit_transaction->t_synchronous_commit;
                 __entry->transaction    = commit_transaction->t_tid;
                 __entry->head           = journal->j_tail_sequence;
         ),
 
-        TP_printk("dev %d,%d transaction %d sync %d head %d",
+        TP_printk("dev %d,%d transaction %d head %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->transaction, __entry->sync_commit, __entry->head)
+                  __entry->transaction, __entry->head)
 );
 
 TRACE_EVENT(jbd_do_submit_data,
@@ -133,19 +127,17 @@ TRACE_EVENT(jbd_do_submit_data,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
         ),
 
         TP_fast_assign(
                 __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->sync_commit = commit_transaction->t_synchronous_commit;
                 __entry->transaction    = commit_transaction->t_tid;
         ),
 
-        TP_printk("dev %d,%d transaction %d sync %d",
+        TP_printk("dev %d,%d transaction %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                   __entry->transaction, __entry->sync_commit)
+                   __entry->transaction)
 );
 
 TRACE_EVENT(jbd_cleanup_journal_tail,
@@ -177,24 +169,23 @@ TRACE_EVENT(jbd_cleanup_journal_tail,
                   __entry->block_nr, __entry->freed)
 );
 
-TRACE_EVENT(jbd_update_superblock_end,
-        TP_PROTO(journal_t *journal, int wait),
+TRACE_EVENT(journal_write_superblock,
+        TP_PROTO(journal_t *journal, int write_op),
 
-        TP_ARGS(journal, wait),
+        TP_ARGS(journal, write_op),
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        int,    wait                    )
+                __field(        int,    write_op                )
         ),
 
         TP_fast_assign(
                 __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->wait           = wait;
+                __entry->write_op       = write_op;
         ),
 
-        TP_printk("dev %d,%d wait %d",
-                  MAJOR(__entry->dev), MINOR(__entry->dev),
-                   __entry->wait)
+        TP_printk("dev %d,%d write_op %x", MAJOR(__entry->dev),
+                  MINOR(__entry->dev), __entry->write_op)
 );
 
 #endif /* _TRACE_JBD_H */
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index cae9a94f025d..0c9783841a30 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -65,6 +65,40 @@ TRACE_EVENT(machine_suspend,
         TP_printk("state=%lu", (unsigned long)__entry->state)
 );
 
+DECLARE_EVENT_CLASS(wakeup_source,
+
+        TP_PROTO(const char *name, unsigned int state),
+
+        TP_ARGS(name, state),
+
+        TP_STRUCT__entry(
+                __string(       name,           name            )
+                __field(        u64,            state           )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, name);
+                __entry->state = state;
+        ),
+
+        TP_printk("%s state=0x%lx", __get_str(name),
+                (unsigned long)__entry->state)
+);
+
+DEFINE_EVENT(wakeup_source, wakeup_source_activate,
+
+        TP_PROTO(const char *name, unsigned int state),
+
+        TP_ARGS(name, state)
+);
+
+DEFINE_EVENT(wakeup_source, wakeup_source_deactivate,
+
+        TP_PROTO(const char *name, unsigned int state),
+
+        TP_ARGS(name, state)
+);
+
 #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
 
 /*
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 337099783f37..1480900c511c 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -292,6 +292,8 @@ TRACE_EVENT(rcu_dyntick,
  *      "More callbacks": Still more callbacks, try again to clear them out.
  *      "Callbacks drained": All callbacks processed, off to dyntick idle!
  *      "Timer": Timer fired to cause CPU to continue processing callbacks.
+ *      "Demigrate": Timer fired on wrong CPU, woke up correct CPU.
+ *      "Cleanup after idle": Idle exited, timer canceled.
  */
 TRACE_EVENT(rcu_prep_idle,
 
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
index 7d497291c85d..4018f5058f27 100644
--- a/include/trace/events/workqueue.h
+++ b/include/trace/events/workqueue.h
@@ -103,7 +103,7 @@ TRACE_EVENT(workqueue_execute_start,
 );
 
 /**
- * workqueue_execute_end - called immediately before the workqueue callback
+ * workqueue_execute_end - called immediately after the workqueue callback
  * @work:       pointer to struct work_struct
  *
  * Allows to track workqueue execution.