Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebf8d974 authored by Robert Richter's avatar Robert Richter
Browse files

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: default avatarRobert Richter <robert.richter@amd.com>
parent 465634ad

drivers/oprofile/buffer_sync.c

+0 −6
Original line number Diff line number Diff line
@@ -316,8 +316,6 @@ static void add_trace_begin(void) 
	add_event_entry(TRACE_BEGIN_CODE);

}



#ifdef CONFIG_OPROFILE_IBS



static void add_data(struct op_entry *entry, struct mm_struct *mm)

{

	unsigned long code, pc, val;
@@ -355,8 +353,6 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm) 
		add_event_entry(val);

}



#endif



static inline void add_sample_entry(unsigned long offset, unsigned long event)

{

	add_event_entry(offset);
@@ -544,10 +540,8 @@ void sync_buffer(int cpu) 
					cookie = get_exec_dcookie(mm);

				add_user_ctx_switch(new, cookie);

			}

#ifdef CONFIG_OPROFILE_IBS

			if (op_cpu_buffer_get_size(&entry))

				add_data(&entry, mm);

#endif

			continue;

		}

drivers/oprofile/cpu_buffer.c

+0 −4
Original line number Diff line number Diff line
@@ -361,8 +361,6 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event) 
	__oprofile_add_ext_sample(pc, regs, event, is_kernel);

}



#ifdef CONFIG_OPROFILE_IBS



/*

 * Add samples with data to the ring buffer.

 *
@@ -397,8 +395,6 @@ fail: 
	cpu_buf->sample_lost_overflow++;

}



#endif



void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)

{

	struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);