summaryrefslogtreecommitdiffstats
path: root/drivers/oprofile/oprof.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2009-07-15 15:19:29 +0200
committerRobert Richter <robert.richter@amd.com>2009-07-20 16:43:19 +0200
commitafe1b50fe6aa56093e9234bdc08779e9fe20b5bf (patch)
tree9c6ce25e09476a0d6c16ceabda66323dd3f5aefe /drivers/oprofile/oprof.c
parent2051cade7ccbe45a8bf8b7809d56b23d6d75ad03 (diff)
downloadtalos-op-linux-afe1b50fe6aa56093e9234bdc08779e9fe20b5bf.tar.gz
talos-op-linux-afe1b50fe6aa56093e9234bdc08779e9fe20b5bf.zip
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: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/oprofile/oprof.c')
-rw-r--r--drivers/oprofile/oprof.c9
1 files changed, 4 insertions, 5 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);
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 @@ out:
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 @@ out:
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
OpenPOWER on IntegriCloud