diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 11:08:52 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 11:08:52 +0200 |
| commit | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (patch) | |
| tree | 315bb66a3ce2e752749a780876e2b7b5f6a596de /drivers/oprofile/oprof.h | |
| parent | 45f197ade73ba95681b9803680c75352fc0a1c0a (diff) | |
| download | linux-4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d.tar.bz2 | |
Revert "Oprofile Multiplexing Patch"
Reverting commit 1a960b402a51d80abf54e3f8e4972374ffe5f22d for the main
branch. Multiplexing will be tracked on a separate feature branch.
Conflicts:
arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'drivers/oprofile/oprof.h')
| -rw-r--r-- | drivers/oprofile/oprof.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h index c4406a7366bb..18323650806e 100644 --- a/drivers/oprofile/oprof.h +++ b/drivers/oprofile/oprof.h @@ -27,8 +27,7 @@ extern unsigned long fs_buffer_watershed; extern struct oprofile_operations oprofile_ops; extern unsigned long oprofile_started; extern unsigned long backtrace_depth; -extern unsigned long timeout_jiffies; - + struct super_block; struct dentry; @@ -36,6 +35,5 @@ void oprofile_create_files(struct super_block * sb, struct dentry * root); void oprofile_timer_init(struct oprofile_operations * ops); int oprofile_set_backtrace(unsigned long depth); -int oprofile_set_timeout(unsigned long time); #endif /* OPROF_H */ |