diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:10:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:10:29 -0500 |
| commit | 124ba9403318d834ef21bcd899c22c870708d2c4 (patch) | |
| tree | 2ac84214085de8780dfa565be7e3ef0d675f6a68 /drivers/oprofile | |
| parent | 74eec26facadbe6dbc0621bc862892c915c4534f (diff) | |
| parent | dd3c4670d7fafeb18bf7542fbcfd2606fb06a4a1 (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/oprof.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h index 769fb0fcac44..d32ef816337c 100644 --- a/drivers/oprofile/oprof.h +++ b/drivers/oprofile/oprof.h | |||
| @@ -35,7 +35,6 @@ struct dentry; | |||
| 35 | 35 | ||
| 36 | void oprofile_create_files(struct super_block *sb, struct dentry *root); | 36 | void oprofile_create_files(struct super_block *sb, struct dentry *root); |
| 37 | int oprofile_timer_init(struct oprofile_operations *ops); | 37 | int oprofile_timer_init(struct oprofile_operations *ops); |
| 38 | void oprofile_timer_exit(void); | ||
| 39 | #ifdef CONFIG_OPROFILE_NMI_TIMER | 38 | #ifdef CONFIG_OPROFILE_NMI_TIMER |
| 40 | int op_nmi_timer_init(struct oprofile_operations *ops); | 39 | int op_nmi_timer_init(struct oprofile_operations *ops); |
| 41 | #else | 40 | #else |