diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
commit | b99053eefce89c5c8500517f5f065c85b57d98ee (patch) | |
tree | 2e99059d55e32db39a2ada348c39f71bb473c0c1 /drivers/oprofile/oprof.h | |
parent | 761e0ee0f0beecee7c2528588b043609b880de58 (diff) | |
parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/oprofile/oprof.h')
-rw-r--r-- | drivers/oprofile/oprof.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h index 18323650806..5df0c21a608 100644 --- a/drivers/oprofile/oprof.h +++ b/drivers/oprofile/oprof.h @@ -11,7 +11,7 @@ #define OPROF_H int oprofile_setup(void); -void oprofile_shutdown(void); +void oprofile_shutdown(void); int oprofilefs_register(void); void oprofilefs_unregister(void); @@ -20,20 +20,20 @@ int oprofile_start(void); 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 struct oprofile_operations oprofile_ops; extern unsigned long oprofile_started; extern unsigned long backtrace_depth; - + struct super_block; struct dentry; -void oprofile_create_files(struct super_block * sb, struct dentry * root); -void oprofile_timer_init(struct oprofile_operations * ops); +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); - + #endif /* OPROF_H */ |