Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c6856f7 authored by Markus Armbruster's avatar Markus Armbruster Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 57136ca6

arch/alpha/oprofile/common.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ op_axp_create_files(struct super_block * sb, struct dentry * root) 


	for (i = 0; i < model->num_counters; ++i) {

		struct dentry *dir;

		char buf[3];

		char buf[4];



		snprintf(buf, sizeof buf, "%d", i);

		dir = oprofilefs_mkdir(sb, root, buf);

arch/i386/oprofile/nmi_int.c

+2 −2
Original line number Diff line number Diff line
@@ -281,9 +281,9 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root) 


	for (i = 0; i < model->num_counters; ++i) {

		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);

		oprofilefs_create_ulong(sb, dir, "enabled", &counter_config[i].enabled); 

		oprofilefs_create_ulong(sb, dir, "event", &counter_config[i].event);

arch/mips/oprofile/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

		struct dentry *dir;

		char buf[3];

		char buf[4];



		snprintf(buf, sizeof buf, "%d", i);

		dir = oprofilefs_mkdir(sb, root, buf);

arch/powerpc/oprofile/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

		struct dentry *dir;

		char buf[3];

		char buf[4];



		snprintf(buf, sizeof buf, "%d", i);

		dir = oprofilefs_mkdir(sb, root, buf);

arch/sh/oprofile/op_model_sh7750.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int sh7750_perf_counter_create_files(struct super_block *sb, struct dentr 


	for (i = 0; i < NR_CNTRS; i++) {

		struct dentry *dir;

		char buf[3];

		char buf[4];



		snprintf(buf, sizeof(buf), "%d", i);

		dir = oprofilefs_mkdir(sb, root, buf);