lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oprofile: Remove oprofile_multiplexing_init()

Browse Source 
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>
This commit is contained in:
Robert Richter
2009-07-15 15:44:18 +02:00
parent afe1b50fe6
commit 16422a6e2d
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/oprofile/oprof.c
View File

@@ -33,7 +33,6 @@ static DEFINE_MUTEX(start_mutex);
static void switch_worker(struct work_struct *work); static void switch_worker(struct work_struct *work);
static DECLARE_DELAYED_WORK(switch_work, switch_worker); static DECLARE_DELAYED_WORK(switch_work, switch_worker);
#define TIME_SLICE_DEFAULT 1
#endif #endif
@@ -248,23 +247,10 @@ out:
return err; 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) static int __init oprofile_init(void)
{ {
int err; int err;
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
oprofile_multiplexing_init();
#endif
err = oprofile_arch_init(&oprofile_ops); err = oprofile_arch_init(&oprofile_ops);
if (err < 0 || timer) { if (err < 0 || timer) {

2
drivers/oprofile/oprofile_files.c
View File

@@ -18,6 +18,7 @@
#define BUFFER_SIZE_DEFAULT 131072 #define BUFFER_SIZE_DEFAULT 131072
#define CPU_BUFFER_SIZE_DEFAULT 8192 #define CPU_BUFFER_SIZE_DEFAULT 8192
#define BUFFER_WATERSHED_DEFAULT 32768 /* FIXME: tune */ #define BUFFER_WATERSHED_DEFAULT 32768 /* FIXME: tune */
#define TIME_SLICE_DEFAULT 1
unsigned long oprofile_buffer_size; unsigned long oprofile_buffer_size;
unsigned long oprofile_cpu_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_buffer_size = BUFFER_SIZE_DEFAULT;
oprofile_cpu_buffer_size = CPU_BUFFER_SIZE_DEFAULT; oprofile_cpu_buffer_size = CPU_BUFFER_SIZE_DEFAULT;
oprofile_buffer_watershed = BUFFER_WATERSHED_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(sb, root, "enable", &enable_fops);
oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666); oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);