dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[ARM] Oprofile: dynamically allocate counter_config 

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2006-03-16 11:32:51 +00:00 committed by Russell King
parent 93ad79496c
commit ae92dc9f7b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/oprofile/common.c
View File

@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/oprofile.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/sysdev.h>
#include <linux/mutex.h>
@ -20,7 +21,7 @@ static struct op_arm_model_spec *op_arm_model;
static int op_arm_enabled;
static DEFINE_MUTEX(op_arm_mutex);
struct op_counter_config counter_config[OP_MAX_COUNTER];
struct op_counter_config *counter_config;
static int op_arm_create_files(struct super_block *sb, struct dentry *root)
{
@ -28,7 +29,7 @@ static int op_arm_create_files(struct super_block *sb, struct dentry *root)
for (i = 0; i < op_arm_model->num_counters; i++) {
struct dentry *dir;
char buf[2];
char buf[4];
snprintf(buf, sizeof buf, "%d", i);
dir = oprofilefs_mkdir(sb, root, buf);
@ -139,6 +140,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
if (ret < 0)
return ret;
counter_config = kmalloc(sizeof(struct op_counter_config) * spec->num_counters,
GFP_KERNEL);
if (!counter_config)
return -ENOMEM;
op_arm_model = spec;
init_driverfs();
ops->create_files = op_arm_create_files;
@ -160,4 +166,5 @@ void oprofile_arch_exit(void)
exit_driverfs();
op_arm_model = NULL;
}
kfree(counter_config);
}

2
arch/arm/oprofile/op_counter.h
View File

@ -24,6 +24,6 @@ struct op_counter_config {
unsigned long user;
};
extern struct op_counter_config counter_config[];
extern struct op_counter_config *counter_config;
#endif /* OP_COUNTER_H */