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

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

oprofile: Rename variable timeout_jiffies and move to oprofile_files.c 



This patch renames timeout_jiffies into an oprofile specific name. The
macro MULTIPLEXING_TIMER_DEFAULT is changed too.

Also, since this variable is controlled using oprofilefs, its
definition is moved to oprofile_files.c.

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

drivers/oprofile/oprof.c

+4 −5
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ static DEFINE_MUTEX(start_mutex); 


static void switch_worker(struct work_struct *work);

static DECLARE_DELAYED_WORK(switch_work, switch_worker);

unsigned long timeout_jiffies;

#define MULTIPLEXING_TIMER_DEFAULT 1

#define TIME_SLICE_DEFAULT		1



#endif
@@ -102,7 +101,7 @@ int oprofile_setup(void) 


static void start_switch_worker(void)

{

	schedule_delayed_work(&switch_work, timeout_jiffies);

	schedule_delayed_work(&switch_work, oprofile_time_slice);

}



static void switch_worker(struct work_struct *work)
@@ -216,7 +215,7 @@ int oprofile_set_timeout(unsigned long val_msec) 
		goto out;

	}



	timeout_jiffies = time_slice;

	oprofile_time_slice = time_slice;



out:

	mutex_unlock(&start_mutex);
@@ -253,7 +252,7 @@ int oprofile_set_backtrace(unsigned long val) 


static void __init oprofile_multiplexing_init(void)

{

	timeout_jiffies = msecs_to_jiffies(MULTIPLEXING_TIMER_DEFAULT);

	oprofile_time_slice = msecs_to_jiffies(TIME_SLICE_DEFAULT);

}



#endif

drivers/oprofile/oprof.h

+2 −1
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ struct oprofile_operations; 
extern unsigned long oprofile_buffer_size;

extern unsigned long oprofile_cpu_buffer_size;

extern unsigned long oprofile_buffer_watershed;

extern unsigned long oprofile_time_slice;



extern struct oprofile_operations oprofile_ops;

extern unsigned long oprofile_started;

extern unsigned long oprofile_backtrace_depth;

extern unsigned long timeout_jiffies;



struct super_block;

struct dentry;

drivers/oprofile/oprofile_files.c

+3 −2
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 
unsigned long oprofile_buffer_size;

unsigned long oprofile_cpu_buffer_size;

unsigned long oprofile_buffer_watershed;

unsigned long oprofile_time_slice;



#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX



static ssize_t timeout_read(struct file *file, char __user *buf,

		size_t count, loff_t *offset)

{

	return oprofilefs_ulong_to_user(jiffies_to_msecs(timeout_jiffies),

	return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),

					buf, count, offset);

}