aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile/oprofile_files.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2009-07-15 09:19:29 -0400
committerRobert Richter <robert.richter@amd.com>2009-07-20 10:43:19 -0400
commitafe1b50fe6aa56093e9234bdc08779e9fe20b5bf (patch)
tree9c6ce25e09476a0d6c16ceabda66323dd3f5aefe /drivers/oprofile/oprofile_files.c
parent2051cade7ccbe45a8bf8b7809d56b23d6d75ad03 (diff)
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/oprofile_files.c')
-rw-r--r--drivers/oprofile/oprofile_files.c5
1 files changed, 3 insertions, 2 deletions
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