diff --git a/[refs] b/[refs]
index 5c524cba6e5a..34cc99d89c7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbe6e2835e32461e7d592077947081c32f3da1d5
+refs/heads/master: 8d15df84a42b140a8262a325b987a283ef9f5f63
diff --git a/trunk/drivers/oprofile/cpu_buffer.c b/trunk/drivers/oprofile/cpu_buffer.c
index d92f0020502e..b426ae8ad2e2 100644
--- a/trunk/drivers/oprofile/cpu_buffer.c
+++ b/trunk/drivers/oprofile/cpu_buffer.c
@@ -97,8 +97,6 @@ int alloc_cpu_buffers(void)
 		b->last_is_kernel = -1;
 		b->tracing = 0;
 		b->buffer_size = buffer_size;
-		b->tail_pos = 0;
-		b->head_pos = 0;
 		b->sample_received = 0;
 		b->sample_lost_overflow = 0;
 		b->backtrace_aborted = 0;
diff --git a/trunk/drivers/oprofile/cpu_buffer.h b/trunk/drivers/oprofile/cpu_buffer.h
index cd28abc06960..65b763ad72da 100644
--- a/trunk/drivers/oprofile/cpu_buffer.h
+++ b/trunk/drivers/oprofile/cpu_buffer.h
@@ -40,8 +40,6 @@ struct op_entry {
 };
 
 struct oprofile_cpu_buffer {
-	volatile unsigned long head_pos;
-	volatile unsigned long tail_pos;
 	unsigned long buffer_size;
 	struct task_struct *last_task;
 	int last_is_kernel;