Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 642474b26ba7b19ee2c884b2f1cb7718a2c5ad99..947ba433865f410ca7a0c9b9b3533830c4203b72 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1567,9 +1567,9 @@ update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu,
 
 /**
  * update_max_tr_single - only copy one trace over, and reset the rest
 
 /**
  * update_max_tr_single - only copy one trace over, and reset the rest

- * @tr - tracer
- * @tsk - task with the latency
- * @cpu - the cpu of the buffer to copy.
+ * @tr: tracer
+ * @tsk: task with the latency
+ * @cpu: the cpu of the buffer to copy.

  *
  * Flip the trace of a single CPU buffer between the @tr and the max_tr.
  */
  *
  * Flip the trace of a single CPU buffer between the @tr and the max_tr.
  */


@@ -1767,7 +1767,7 @@ static void __init apply_trace_boot_options(void);
 
 /**
  * register_tracer - register a tracer with the ftrace system.
 
 /**
  * register_tracer - register a tracer with the ftrace system.

- * @type - the plugin for the tracer
+ * @type: the plugin for the tracer

  *
  * Register a new plugin tracer.
  */
  *
  * Register a new plugin tracer.
  */


@@ -2230,9 +2230,9 @@ static bool tracing_record_taskinfo_skip(int flags)
 /**
  * tracing_record_taskinfo - record the task info of a task
  *
 /**
  * tracing_record_taskinfo - record the task info of a task
  *

- * @task  - task to record
- * @flags - TRACE_RECORD_CMDLINE for recording comm
- *        - TRACE_RECORD_TGID for recording tgid
+ * @task:  task to record
+ * @flags: TRACE_RECORD_CMDLINE for recording comm
+ *         TRACE_RECORD_TGID for recording tgid

  */
 void tracing_record_taskinfo(struct task_struct *task, int flags)
 {
  */
 void tracing_record_taskinfo(struct task_struct *task, int flags)
 {


@@ -2258,10 +2258,10 @@ void tracing_record_taskinfo(struct task_struct *task, int flags)
 /**
  * tracing_record_taskinfo_sched_switch - record task info for sched_switch
  *
 /**
  * tracing_record_taskinfo_sched_switch - record task info for sched_switch
  *

- * @prev - previous task during sched_switch
- * @next - next task during sched_switch
- * @flags - TRACE_RECORD_CMDLINE for recording comm
- *          TRACE_RECORD_TGID for recording tgid
+ * @prev: previous task during sched_switch
+ * @next: next task during sched_switch
+ * @flags: TRACE_RECORD_CMDLINE for recording comm
+ *         TRACE_RECORD_TGID for recording tgid

  */
 void tracing_record_taskinfo_sched_switch(struct task_struct *prev,
                                          struct task_struct *next, int flags)
  */
 void tracing_record_taskinfo_sched_switch(struct task_struct *prev,
                                          struct task_struct *next, int flags)


@@ -3072,7 +3072,9 @@ static void trace_printk_start_stop_comm(int enabled)
 
 /**
  * trace_vbprintk - write binary msg to tracing buffer
 
 /**
  * trace_vbprintk - write binary msg to tracing buffer

- *
+ * @ip:    The address of the caller
+ * @fmt:   The string format to write to the buffer
+ * @args:  Arguments for @fmt

  */
 int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
 {
  */
 int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
 {