aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2009-01-06 18:20:57 -0500
committerRobert Richter <robert.richter@amd.com>2009-01-07 16:47:56 -0500
commitebf8d974e298018f0b4ee02b1b097bf5500d3d27 (patch)
tree84cdfc122513336bfda25be03d85518642b2f924 /drivers
parent465634adc1d09b490c8ee31885575be39d375d53 (diff)
oprofile: remove #ifdef CONFIG_OPROFILE_IBS in non-ibs code
The ifdefs can be removed since the code is no longer ibs specific and can be used for other purposes as well. IBS specific code is only in op_model_amd.c. Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/oprofile/buffer_sync.c6
-rw-r--r--drivers/oprofile/cpu_buffer.c4
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index d692fdc1a211..ac014cb27915 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -316,8 +316,6 @@ static void add_trace_begin(void)
316 add_event_entry(TRACE_BEGIN_CODE); 316 add_event_entry(TRACE_BEGIN_CODE);
317} 317}
318 318
319#ifdef CONFIG_OPROFILE_IBS
320
321static void add_data(struct op_entry *entry, struct mm_struct *mm) 319static void add_data(struct op_entry *entry, struct mm_struct *mm)
322{ 320{
323 unsigned long code, pc, val; 321 unsigned long code, pc, val;
@@ -355,8 +353,6 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
355 add_event_entry(val); 353 add_event_entry(val);
356} 354}
357 355
358#endif
359
360static inline void add_sample_entry(unsigned long offset, unsigned long event) 356static inline void add_sample_entry(unsigned long offset, unsigned long event)
361{ 357{
362 add_event_entry(offset); 358 add_event_entry(offset);
@@ -544,10 +540,8 @@ void sync_buffer(int cpu)
544 cookie = get_exec_dcookie(mm); 540 cookie = get_exec_dcookie(mm);
545 add_user_ctx_switch(new, cookie); 541 add_user_ctx_switch(new, cookie);
546 } 542 }
547#ifdef CONFIG_OPROFILE_IBS
548 if (op_cpu_buffer_get_size(&entry)) 543 if (op_cpu_buffer_get_size(&entry))
549 add_data(&entry, mm); 544 add_data(&entry, mm);
550#endif
551 continue; 545 continue;
552 } 546 }
553 547
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index ddba9d01f09b..b846af632c81 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -361,8 +361,6 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
361 __oprofile_add_ext_sample(pc, regs, event, is_kernel); 361 __oprofile_add_ext_sample(pc, regs, event, is_kernel);
362} 362}
363 363
364#ifdef CONFIG_OPROFILE_IBS
365
366/* 364/*
367 * Add samples with data to the ring buffer. 365 * Add samples with data to the ring buffer.
368 * 366 *
@@ -397,8 +395,6 @@ fail:
397 cpu_buf->sample_lost_overflow++; 395 cpu_buf->sample_lost_overflow++;
398} 396}
399 397
400#endif
401
402void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event) 398void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)
403{ 399{
404 struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer); 400 struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);