aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/oprofile')
-rw-r--r--drivers/oprofile/oprof.c9
-rw-r--r--drivers/oprofile/oprof.h3
-rw-r--r--drivers/oprofile/oprofile_files.c5
3 files changed, 9 insertions, 8 deletions
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index 42c9c765f9f1..2b33de716412 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -33,8 +33,7 @@ static DEFINE_MUTEX(start_mutex);
33 33
34static void switch_worker(struct work_struct *work); 34static void switch_worker(struct work_struct *work);
35static DECLARE_DELAYED_WORK(switch_work, switch_worker); 35static DECLARE_DELAYED_WORK(switch_work, switch_worker);
36unsigned long timeout_jiffies; 36#define TIME_SLICE_DEFAULT 1
37#define MULTIPLEXING_TIMER_DEFAULT 1
38 37
39#endif 38#endif
40 39
@@ -102,7 +101,7 @@ out:
102 101
103static void start_switch_worker(void) 102static void start_switch_worker(void)
104{ 103{
105 schedule_delayed_work(&switch_work, timeout_jiffies); 104 schedule_delayed_work(&switch_work, oprofile_time_slice);
106} 105}
107 106
108static void switch_worker(struct work_struct *work) 107static void switch_worker(struct work_struct *work)
@@ -216,7 +215,7 @@ int oprofile_set_timeout(unsigned long val_msec)
216 goto out; 215 goto out;
217 } 216 }
218 217
219 timeout_jiffies = time_slice; 218 oprofile_time_slice = time_slice;
220 219
221out: 220out:
222 mutex_unlock(&start_mutex); 221 mutex_unlock(&start_mutex);
@@ -253,7 +252,7 @@ out:
253 252
254static void __init oprofile_multiplexing_init(void) 253static void __init oprofile_multiplexing_init(void)
255{ 254{
256 timeout_jiffies = msecs_to_jiffies(MULTIPLEXING_TIMER_DEFAULT); 255 oprofile_time_slice = msecs_to_jiffies(TIME_SLICE_DEFAULT);
257} 256}
258 257
259#endif 258#endif
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h
index ee38abcc74f3..cb92f5c98c1a 100644
--- a/drivers/oprofile/oprof.h
+++ b/drivers/oprofile/oprof.h
@@ -24,10 +24,11 @@ struct oprofile_operations;
24extern unsigned long oprofile_buffer_size; 24extern unsigned long oprofile_buffer_size;
25extern unsigned long oprofile_cpu_buffer_size; 25extern unsigned long oprofile_cpu_buffer_size;
26extern unsigned long oprofile_buffer_watershed; 26extern unsigned long oprofile_buffer_watershed;
27extern unsigned long oprofile_time_slice;
28
27extern struct oprofile_operations oprofile_ops; 29extern struct oprofile_operations oprofile_ops;
28extern unsigned long oprofile_started; 30extern unsigned long oprofile_started;
29extern unsigned long oprofile_backtrace_depth; 31extern unsigned long oprofile_backtrace_depth;
30extern unsigned long timeout_jiffies;
31 32
32struct super_block; 33struct super_block;
33struct dentry; 34struct dentry;
diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
index 468ec3e4f856..4c5b94775844 100644
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -22,14 +22,15 @@
22unsigned long oprofile_buffer_size; 22unsigned long oprofile_buffer_size;
23unsigned long oprofile_cpu_buffer_size; 23unsigned long oprofile_cpu_buffer_size;
24unsigned long oprofile_buffer_watershed; 24unsigned long oprofile_buffer_watershed;
25unsigned long oprofile_time_slice;
25 26
26#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX 27#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
27 28
28static ssize_t timeout_read(struct file *file, char __user *buf, 29static ssize_t timeout_read(struct file *file, char __user *buf,
29 size_t count, loff_t *offset) 30 size_t count, loff_t *offset)
30{ 31{
31 return oprofilefs_ulong_to_user(jiffies_to_msecs(timeout_jiffies), 32 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
32 buf, count, offset); 33 buf, count, offset);
33} 34}
34 35
35 36