Commit 16422a6e authored by Robert Richter's avatar Robert Richter
Browse files

oprofile: Remove oprofile_multiplexing_init() 



oprofile_multiplexing_init() can be removed when moving the
initialization of oprofile_time_slice to oprofile_create_files().

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent afe1b50f

drivers/oprofile/oprof.c

+0 −14
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ static DEFINE_MUTEX(start_mutex); 


static void switch_worker(struct work_struct *work);

static DECLARE_DELAYED_WORK(switch_work, switch_worker);

#define TIME_SLICE_DEFAULT		1



#endif
@@ -248,23 +247,10 @@ int oprofile_set_backtrace(unsigned long val) 
	return err;

}



#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX



static void __init oprofile_multiplexing_init(void)

{

	oprofile_time_slice = msecs_to_jiffies(TIME_SLICE_DEFAULT);

}



#endif



static int __init oprofile_init(void)

{

	int err;



#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX

	oprofile_multiplexing_init();

#endif



	err = oprofile_arch_init(&oprofile_ops);



	if (err < 0 || timer) {

drivers/oprofile/oprofile_files.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define BUFFER_SIZE_DEFAULT		131072

#define CPU_BUFFER_SIZE_DEFAULT		8192

#define BUFFER_WATERSHED_DEFAULT	32768	/* FIXME: tune */

#define TIME_SLICE_DEFAULT		1



unsigned long oprofile_buffer_size;

unsigned long oprofile_cpu_buffer_size;
@@ -170,6 +171,7 @@ void oprofile_create_files(struct super_block *sb, struct dentry *root) 
	oprofile_buffer_size =		BUFFER_SIZE_DEFAULT;

	oprofile_cpu_buffer_size =	CPU_BUFFER_SIZE_DEFAULT;

	oprofile_buffer_watershed =	BUFFER_WATERSHED_DEFAULT;

	oprofile_time_slice =		msecs_to_jiffies(TIME_SLICE_DEFAULT);



	oprofilefs_create_file(sb, root, "enable", &enable_fops);

	oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);