From 45364ed371b1447938eac3fb1d2c768626461295 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Tue, 22 Jul 2008 21:09:00 +0200 Subject: [PATCH] --- yaml --- r: 113597 b: refs/heads/master c: fc2bd7345b4e006a34c2ea3711d8c6b83cba50f7 h: refs/heads/master i: 113595: 68cfe3ac7816b37de148f62cb15b1e8d9760bd73 v: v3 --- [refs] | 2 +- trunk/arch/x86/oprofile/op_model_athlon.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 684ff738e0d4..00d164911262 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebb535de267386f659e0348185b1e361dbba3b59 +refs/heads/master: fc2bd7345b4e006a34c2ea3711d8c6b83cba50f7 diff --git a/trunk/arch/x86/oprofile/op_model_athlon.c b/trunk/arch/x86/oprofile/op_model_athlon.c index ce732362dbb0..2650b12a0c56 100644 --- a/trunk/arch/x86/oprofile/op_model_athlon.c +++ b/trunk/arch/x86/oprofile/op_model_athlon.c @@ -446,13 +446,13 @@ static void clear_ibs_nmi(void) on_each_cpu(apic_clear_ibs_nmi_per_cpu, NULL, 1); } -static void setup_ibs_files(struct super_block *sb, struct dentry *root) +static int setup_ibs_files(struct super_block * sb, struct dentry * root) { char buf[12]; struct dentry *dir; if (!ibs_allowed) - return; + return 0; /* setup some reasonable defaults */ ibs_config.max_cnt_fetch = 250000; @@ -476,6 +476,8 @@ static void setup_ibs_files(struct super_block *sb, struct dentry *root) &ibs_config.max_cnt_op); oprofilefs_create_ulong(sb, dir, "dispatched_ops", &ibs_config.dispatched_ops); + + return 0; } static int op_amd_init(struct oprofile_operations *ops)