aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/oprofile/cpu_buffer.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 92bf8c0d86fe..ac79f6676033 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -188,8 +188,8 @@ unsigned long op_cpu_buffer_entries(int cpu)
188} 188}
189 189
190static inline int 190static inline int
191add_sample(struct oprofile_cpu_buffer *cpu_buf, 191op_add_sample(struct oprofile_cpu_buffer *cpu_buf,
192 unsigned long pc, unsigned long event) 192 unsigned long pc, unsigned long event)
193{ 193{
194 struct op_entry entry; 194 struct op_entry entry;
195 int ret; 195 int ret;
@@ -207,7 +207,7 @@ add_sample(struct oprofile_cpu_buffer *cpu_buf,
207static inline int 207static inline int
208add_code(struct oprofile_cpu_buffer *buffer, unsigned long value) 208add_code(struct oprofile_cpu_buffer *buffer, unsigned long value)
209{ 209{
210 return add_sample(buffer, ESCAPE_CODE, value); 210 return op_add_sample(buffer, ESCAPE_CODE, value);
211} 211}
212 212
213/* This must be safe from any context. It's safe writing here 213/* This must be safe from any context. It's safe writing here
@@ -249,7 +249,7 @@ static int log_sample(struct oprofile_cpu_buffer *cpu_buf, unsigned long pc,
249 goto fail; 249 goto fail;
250 } 250 }
251 251
252 if (add_sample(cpu_buf, pc, event)) 252 if (op_add_sample(cpu_buf, pc, event))
253 goto fail; 253 goto fail;
254 254
255 return 1; 255 return 1;
@@ -337,14 +337,14 @@ void oprofile_add_ibs_sample(struct pt_regs * const regs,
337 } 337 }
338 338
339 fail = fail || add_code(cpu_buf, ibs_code); 339 fail = fail || add_code(cpu_buf, ibs_code);
340 fail = fail || add_sample(cpu_buf, ibs_sample[0], ibs_sample[1]); 340 fail = fail || op_add_sample(cpu_buf, ibs_sample[0], ibs_sample[1]);
341 fail = fail || add_sample(cpu_buf, ibs_sample[2], ibs_sample[3]); 341 fail = fail || op_add_sample(cpu_buf, ibs_sample[2], ibs_sample[3]);
342 fail = fail || add_sample(cpu_buf, ibs_sample[4], ibs_sample[5]); 342 fail = fail || op_add_sample(cpu_buf, ibs_sample[4], ibs_sample[5]);
343 343
344 if (ibs_code == IBS_OP_BEGIN) { 344 if (ibs_code == IBS_OP_BEGIN) {
345 fail = fail || add_sample(cpu_buf, ibs_sample[6], ibs_sample[7]); 345 fail = fail || op_add_sample(cpu_buf, ibs_sample[6], ibs_sample[7]);
346 fail = fail || add_sample(cpu_buf, ibs_sample[8], ibs_sample[9]); 346 fail = fail || op_add_sample(cpu_buf, ibs_sample[8], ibs_sample[9]);
347 fail = fail || add_sample(cpu_buf, ibs_sample[10], ibs_sample[11]); 347 fail = fail || op_add_sample(cpu_buf, ibs_sample[10], ibs_sample[11]);
348 } 348 }
349 349
350 if (!fail) 350 if (!fail)
@@ -376,7 +376,7 @@ void oprofile_add_trace(unsigned long pc)
376 if (pc == ESCAPE_CODE) 376 if (pc == ESCAPE_CODE)
377 goto fail; 377 goto fail;
378 378
379 if (add_sample(cpu_buf, pc, 0)) 379 if (op_add_sample(cpu_buf, pc, 0))
380 goto fail; 380 goto fail;
381 381
382 return; 382 return;