On Wed, Aug 01, 2007 at 05:01:09PM +0400, Dajie Tan wrote: > diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c > index a83c3db..fde9819 100644 > --- a/drivers/oprofile/cpu_buffer.c > +++ b/drivers/oprofile/cpu_buffer.c > @@ -148,6 +148,10 @@ add_sample(struct oprofile_cpu_buffer * cpu_buf, > unsigned long pc, unsigned long event) > { > struct op_sample * entry = &cpu_buf->buffer[cpu_buf->head_pos]; > + > + if(!entry) > + return; > + Perhaps I wasn't clear. This change is unacceptable and must not be merged. john