3 files changed, 12 insertions, 12 deletions

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 737bd9484822..d295d92b57f0 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -331,7 +331,7 @@ static void add_ibs_begin(int cpu, int code, struct mm_struct *mm)
         off_t offset;
         struct op_sample *sample;
 
-        sample = cpu_buffer_read_entry(cpu);
+        sample = op_cpu_buffer_read_entry(cpu);
         if (!sample)
                 goto Error;
         rip = sample->eip;
@@ -370,7 +370,7 @@ static void add_ibs_begin(int cpu, int code, struct mm_struct *mm)
                 count = IBS_OP_CODE_SIZE;       /*IBS OP is 5 int64s*/
 
         for (i = 0; i < count; i++) {
-                sample = cpu_buffer_read_entry(cpu);
+                sample = op_cpu_buffer_read_entry(cpu);
                 if (!sample)
                         goto Error;
                 add_event_entry(sample->eip);
@@ -537,11 +537,11 @@ void sync_buffer(int cpu)
 
         add_cpu_switch(cpu);
 
-        cpu_buffer_reset(cpu);
-        available = cpu_buffer_entries(cpu);
+        op_cpu_buffer_reset(cpu);
+        available = op_cpu_buffer_entries(cpu);
 
         for (i = 0; i < available; ++i) {
-                struct op_sample *s = cpu_buffer_read_entry(cpu);
+                struct op_sample *s = op_cpu_buffer_read_entry(cpu);
                 if (!s)
                         break;
 
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index fcf96f608d86..e52c085cd186 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -152,14 +152,14 @@ add_sample(struct oprofile_cpu_buffer *cpu_buf,
         struct op_entry entry;
         int ret;
 
-        ret = cpu_buffer_write_entry(&entry);
+        ret = op_cpu_buffer_write_entry(&entry);
         if (ret)
                 return ret;
 
         entry.sample->eip = pc;
         entry.sample->event = event;
 
-        ret = cpu_buffer_write_commit(&entry);
+        ret = op_cpu_buffer_write_commit(&entry);
         if (ret)
                 return ret;
 
diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h
index aacb0f0bc566..83d491e273fe 100644
--- a/drivers/oprofile/cpu_buffer.h
+++ b/drivers/oprofile/cpu_buffer.h
@@ -64,7 +64,7 @@ DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);
  * reset these to invalid values; the next sample collected will
  * populate the buffer with proper values to initialize the buffer
  */
-static inline void cpu_buffer_reset(int cpu)
+static inline void op_cpu_buffer_reset(int cpu)
 {
         struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu);
 
@@ -72,7 +72,7 @@ static inline void cpu_buffer_reset(int cpu)
         cpu_buf->last_task = NULL;
 }
 
-static inline int cpu_buffer_write_entry(struct op_entry *entry)
+static inline int op_cpu_buffer_write_entry(struct op_entry *entry)
 {
         entry->event = ring_buffer_lock_reserve(op_ring_buffer_write,
                                                 sizeof(struct op_sample),
@@ -88,13 +88,13 @@ static inline int cpu_buffer_write_entry(struct op_entry *entry)
         return 0;
 }
 
-static inline int cpu_buffer_write_commit(struct op_entry *entry)
+static inline int op_cpu_buffer_write_commit(struct op_entry *entry)
 {
         return ring_buffer_unlock_commit(op_ring_buffer_write, entry->event,
                                          entry->irq_flags);
 }
 
-static inline struct op_sample *cpu_buffer_read_entry(int cpu)
+static inline struct op_sample *op_cpu_buffer_read_entry(int cpu)
 {
         struct ring_buffer_event *e;
         e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL);
@@ -111,7 +111,7 @@ static inline struct op_sample *cpu_buffer_read_entry(int cpu)
 }
 
 /* "acquire" as many cpu buffer slots as we can */
-static inline unsigned long cpu_buffer_entries(int cpu)
+static inline unsigned long op_cpu_buffer_entries(int cpu)
 {
         return ring_buffer_entries_cpu(op_ring_buffer_read, cpu)
                 + ring_buffer_entries_cpu(op_ring_buffer_write, cpu);