mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
[PATCH] oprofile: Fix unnecessary cleverness
nmi_create_files() in arch/i386/oprofile/nmi_int.c depends on model->num_counters (number of performance counters) being less than 10. While this is currently the case, it's too clever by half. Other archs aren't quite as clever: they assume 100. I suggest to normalize them all to 1000. Cc: Philippe Elie <phil.el@wanadoo.fr> Cc: John Levon <levon@movementarian.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
57136ca6d5
commit
0c6856f702
@ -112,7 +112,7 @@ op_axp_create_files(struct super_block * sb, struct dentry * root)
|
|||||||
|
|
||||||
for (i = 0; i < model->num_counters; ++i) {
|
for (i = 0; i < model->num_counters; ++i) {
|
||||||
struct dentry *dir;
|
struct dentry *dir;
|
||||||
char buf[3];
|
char buf[4];
|
||||||
|
|
||||||
snprintf(buf, sizeof buf, "%d", i);
|
snprintf(buf, sizeof buf, "%d", i);
|
||||||
dir = oprofilefs_mkdir(sb, root, buf);
|
dir = oprofilefs_mkdir(sb, root, buf);
|
||||||
|
@ -281,9 +281,9 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root)
|
|||||||
|
|
||||||
for (i = 0; i < model->num_counters; ++i) {
|
for (i = 0; i < model->num_counters; ++i) {
|
||||||
struct dentry * dir;
|
struct dentry * dir;
|
||||||
char buf[2];
|
char buf[4];
|
||||||
|
|
||||||
snprintf(buf, 2, "%d", i);
|
snprintf(buf, sizeof(buf), "%d", i);
|
||||||
dir = oprofilefs_mkdir(sb, root, buf);
|
dir = oprofilefs_mkdir(sb, root, buf);
|
||||||
oprofilefs_create_ulong(sb, dir, "enabled", &counter_config[i].enabled);
|
oprofilefs_create_ulong(sb, dir, "enabled", &counter_config[i].enabled);
|
||||||
oprofilefs_create_ulong(sb, dir, "event", &counter_config[i].event);
|
oprofilefs_create_ulong(sb, dir, "event", &counter_config[i].event);
|
||||||
|
@ -38,7 +38,7 @@ static int op_mips_create_files(struct super_block * sb, struct dentry * root)
|
|||||||
|
|
||||||
for (i = 0; i < model->num_counters; ++i) {
|
for (i = 0; i < model->num_counters; ++i) {
|
||||||
struct dentry *dir;
|
struct dentry *dir;
|
||||||
char buf[3];
|
char buf[4];
|
||||||
|
|
||||||
snprintf(buf, sizeof buf, "%d", i);
|
snprintf(buf, sizeof buf, "%d", i);
|
||||||
dir = oprofilefs_mkdir(sb, root, buf);
|
dir = oprofilefs_mkdir(sb, root, buf);
|
||||||
|
@ -94,7 +94,7 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
|
|||||||
|
|
||||||
for (i = 0; i < model->num_counters; ++i) {
|
for (i = 0; i < model->num_counters; ++i) {
|
||||||
struct dentry *dir;
|
struct dentry *dir;
|
||||||
char buf[3];
|
char buf[4];
|
||||||
|
|
||||||
snprintf(buf, sizeof buf, "%d", i);
|
snprintf(buf, sizeof buf, "%d", i);
|
||||||
dir = oprofilefs_mkdir(sb, root, buf);
|
dir = oprofilefs_mkdir(sb, root, buf);
|
||||||
|
@ -198,7 +198,7 @@ static int sh7750_perf_counter_create_files(struct super_block *sb, struct dentr
|
|||||||
|
|
||||||
for (i = 0; i < NR_CNTRS; i++) {
|
for (i = 0; i < NR_CNTRS; i++) {
|
||||||
struct dentry *dir;
|
struct dentry *dir;
|
||||||
char buf[3];
|
char buf[4];
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%d", i);
|
snprintf(buf, sizeof(buf), "%d", i);
|
||||||
dir = oprofilefs_mkdir(sb, root, buf);
|
dir = oprofilefs_mkdir(sb, root, buf);
|
||||||
|
Loading…
Reference in New Issue
Block a user