Prev: simulating errors in the file system
Next: mm: iommu: An API to unify IOMMU, CPU and device memory management
From: Li Zefan on 15 Jul 2010 20:50 > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h > index 2114b4c..2f8619b 100644 > --- a/kernel/trace/trace.h > +++ b/kernel/trace/trace.h > @@ -22,7 +22,6 @@ enum trace_type { > TRACE_STACK, > TRACE_PRINT, > TRACE_BPRINT, > - TRACE_SPECIAL, > TRACE_MMIO_RW, > TRACE_MMIO_MAP, > TRACE_BRANCH, > @@ -332,11 +331,6 @@ void tracing_sched_wakeup_trace(struct trace_array *tr, > struct task_struct *wakee, > struct task_struct *cur, > unsigned long flags, int pc); > -void trace_special(struct trace_array *tr, > - struct trace_array_cpu *data, > - unsigned long arg1, > - unsigned long arg2, > - unsigned long arg3, int pc); > void trace_function(struct trace_array *tr, > unsigned long ip, > unsigned long parent_ip, You forgot to delete this: IF_ASSIGN(var, ent, struct special_entry, 0); \ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Frederic Weisbecker on 15 Jul 2010 23:10
On Fri, Jul 16, 2010 at 08:52:20AM +0800, Li Zefan wrote: > > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h > > index 2114b4c..2f8619b 100644 > > --- a/kernel/trace/trace.h > > +++ b/kernel/trace/trace.h > > @@ -22,7 +22,6 @@ enum trace_type { > > TRACE_STACK, > > TRACE_PRINT, > > TRACE_BPRINT, > > - TRACE_SPECIAL, > > TRACE_MMIO_RW, > > TRACE_MMIO_MAP, > > TRACE_BRANCH, > > @@ -332,11 +331,6 @@ void tracing_sched_wakeup_trace(struct trace_array *tr, > > struct task_struct *wakee, > > struct task_struct *cur, > > unsigned long flags, int pc); > > -void trace_special(struct trace_array *tr, > > - struct trace_array_cpu *data, > > - unsigned long arg1, > > - unsigned long arg2, > > - unsigned long arg3, int pc); > > void trace_function(struct trace_array *tr, > > unsigned long ip, > > unsigned long parent_ip, > > You forgot to delete this: > > IF_ASSIGN(var, ent, struct special_entry, 0); \ Oops, right, I forgot that. And I forgot to Cc you as well, sorry. Will fix, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |