diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 04:45:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 04:45:50 +0100 |
| commit | e8b722f487589a1f60ca27adc695494f188d404e (patch) | |
| tree | be3897dceb9b7c0949a8917ab11eea2752375e3b /drivers/oprofile/oprof.h | |
| parent | 01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'drivers/oprofile/oprof.h')
| -rw-r--r-- | drivers/oprofile/oprof.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h index 5df0c21a608f..c288d3c24b50 100644 --- a/drivers/oprofile/oprof.h +++ b/drivers/oprofile/oprof.h @@ -21,12 +21,12 @@ void oprofile_stop(void); struct oprofile_operations; -extern unsigned long fs_buffer_size; -extern unsigned long fs_cpu_buffer_size; -extern unsigned long fs_buffer_watershed; +extern unsigned long oprofile_buffer_size; +extern unsigned long oprofile_cpu_buffer_size; +extern unsigned long oprofile_buffer_watershed; extern struct oprofile_operations oprofile_ops; extern unsigned long oprofile_started; -extern unsigned long backtrace_depth; +extern unsigned long oprofile_backtrace_depth; struct super_block; struct dentry; |