nfs: new subdir Documentation/filesystems/nfs

[safe/jmp/linux-2.6] / drivers / oprofile / oprofile_files.c

diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
index 468ec3e..bbd7516 100644 (file)
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -18,18 +18,20 @@
 #define BUFFER_SIZE_DEFAULT            131072
 #define CPU_BUFFER_SIZE_DEFAULT                8192
 #define BUFFER_WATERSHED_DEFAULT       32768   /* FIXME: tune */
+#define TIME_SLICE_DEFAULT             1
 
 unsigned long oprofile_buffer_size;
 unsigned long oprofile_cpu_buffer_size;
 unsigned long oprofile_buffer_watershed;
+unsigned long oprofile_time_slice;
 
 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
 
 static ssize_t timeout_read(struct file *file, char __user *buf,
                size_t count, loff_t *offset)
 {
-       return oprofilefs_ulong_to_user(jiffies_to_msecs(timeout_jiffies),
-                               buf, count, offset);
+       return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
+                                       buf, count, offset);
 }
 
 
@@ -169,6 +171,7 @@ void oprofile_create_files(struct super_block *sb, struct dentry *root)
        oprofile_buffer_size =          BUFFER_SIZE_DEFAULT;
        oprofile_cpu_buffer_size =      CPU_BUFFER_SIZE_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_perm(sb, root, "dump", &dump_fops, 0666);