The patch titled
oprofile: Fix unnecessary cleverness
has been removed from the -mm tree. Its filename is
oprofile-fix-unnecessary-cleverness.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: oprofile: Fix unnecessary cleverness
From: Markus Armbruster <armbru@xxxxxxxxxx>
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@xxxxxxxxxx>
Cc: John Levon <levon@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/oprofile/common.c | 2 +-
arch/i386/oprofile/nmi_int.c | 4 ++--
arch/mips/oprofile/common.c | 2 +-
arch/powerpc/oprofile/common.c | 2 +-
arch/sh/oprofile/op_model_sh7750.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/alpha/oprofile/common.c~oprofile-fix-unnecessary-cleverness arch/alpha/oprofile/common.c
--- a/arch/alpha/oprofile/common.c~oprofile-fix-unnecessary-cleverness
+++ a/arch/alpha/oprofile/common.c
@@ -112,7 +112,7 @@ op_axp_create_files(struct super_block *
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);
diff -puN arch/i386/oprofile/nmi_int.c~oprofile-fix-unnecessary-cleverness arch/i386/oprofile/nmi_int.c
--- a/arch/i386/oprofile/nmi_int.c~oprofile-fix-unnecessary-cleverness
+++ a/arch/i386/oprofile/nmi_int.c
@@ -281,9 +281,9 @@ static int nmi_create_files(struct super
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);
diff -puN arch/mips/oprofile/common.c~oprofile-fix-unnecessary-cleverness arch/mips/oprofile/common.c
--- a/arch/mips/oprofile/common.c~oprofile-fix-unnecessary-cleverness
+++ a/arch/mips/oprofile/common.c
@@ -38,7 +38,7 @@ static int op_mips_create_files(struct s
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);
diff -puN arch/powerpc/oprofile/common.c~oprofile-fix-unnecessary-cleverness arch/powerpc/oprofile/common.c
--- a/arch/powerpc/oprofile/common.c~oprofile-fix-unnecessary-cleverness
+++ a/arch/powerpc/oprofile/common.c
@@ -94,7 +94,7 @@ static int op_powerpc_create_files(struc
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);
diff -puN arch/sh/oprofile/op_model_sh7750.c~oprofile-fix-unnecessary-cleverness arch/sh/oprofile/op_model_sh7750.c
--- a/arch/sh/oprofile/op_model_sh7750.c~oprofile-fix-unnecessary-cleverness
+++ a/arch/sh/oprofile/op_model_sh7750.c
@@ -198,7 +198,7 @@ static int sh7750_perf_counter_create_fi
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);
_
Patches currently in -mm which might be from armbru@xxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
