aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2009-07-15 09:44:18 -0400
committerRobert Richter <robert.richter@amd.com>2009-07-20 10:43:19 -0400
commit16422a6e2d16a39861ae5b0b11d9b411a245ab83 (patch)
treea3c2c5122b234e3f367df19a303da0200bfeee15 /drivers/oprofile
parentafe1b50fe6aa56093e9234bdc08779e9fe20b5bf (diff)
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: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/oprofile')
-rw-r--r--drivers/oprofile/oprof.c14
-rw-r--r--drivers/oprofile/oprofile_files.c2
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index 2b33de716412..fa6cccd87cf8 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -33,7 +33,6 @@ 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);
36#define TIME_SLICE_DEFAULT 1
37 36
38#endif 37#endif
39 38
@@ -248,23 +247,10 @@ out:
248 return err; 247 return err;
249} 248}
250 249
251#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
252
253static void __init oprofile_multiplexing_init(void)
254{
255 oprofile_time_slice = msecs_to_jiffies(TIME_SLICE_DEFAULT);
256}
257
258#endif
259
260static int __init oprofile_init(void) 250static int __init oprofile_init(void)
261{ 251{
262 int err; 252 int err;
263 253
264#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
265 oprofile_multiplexing_init();
266#endif
267
268 err = oprofile_arch_init(&oprofile_ops); 254 err = oprofile_arch_init(&oprofile_ops);
269 255
270 if (err < 0 || timer) { 256 if (err < 0 || timer) {
diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
index 4c5b94775844..bbd7516e0869 100644
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -18,6 +18,7 @@
18#define BUFFER_SIZE_DEFAULT 131072 18#define BUFFER_SIZE_DEFAULT 131072
19#define CPU_BUFFER_SIZE_DEFAULT 8192 19#define CPU_BUFFER_SIZE_DEFAULT 8192
20#define BUFFER_WATERSHED_DEFAULT 32768 /* FIXME: tune */ 20#define BUFFER_WATERSHED_DEFAULT 32768 /* FIXME: tune */
21#define TIME_SLICE_DEFAULT 1
21 22
22unsigned long oprofile_buffer_size; 23unsigned long oprofile_buffer_size;
23unsigned long oprofile_cpu_buffer_size; 24unsigned long oprofile_cpu_buffer_size;
@@ -170,6 +171,7 @@ void oprofile_create_files(struct super_block *sb, struct dentry *root)
170 oprofile_buffer_size = BUFFER_SIZE_DEFAULT; 171 oprofile_buffer_size = BUFFER_SIZE_DEFAULT;
171 oprofile_cpu_buffer_size = CPU_BUFFER_SIZE_DEFAULT; 172 oprofile_cpu_buffer_size = CPU_BUFFER_SIZE_DEFAULT;
172 oprofile_buffer_watershed = BUFFER_WATERSHED_DEFAULT; 173 oprofile_buffer_watershed = BUFFER_WATERSHED_DEFAULT;
174 oprofile_time_slice = msecs_to_jiffies(TIME_SLICE_DEFAULT);
173 175
174 oprofilefs_create_file(sb, root, "enable", &enable_fops); 176 oprofilefs_create_file(sb, root, "enable", &enable_fops);
175 oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666); 177 oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);