[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1242985373.22654.225.camel@zakaz.uk.xensource.com>
Date: Fri, 22 May 2009 10:42:53 +0100
From: Ian Campbell <Ian.Campbell@...rix.com>
To: linux-kernel <linux-kernel@...r.kernel.org>
CC: Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Paul Mackerras <paulus@...ba.org>,
Corey Ashford <cjashfor@...ux.vnet.ibm.com>,
Ingo Molnar <mingo@...e.hu>
Subject: [PATCH] perf_counter: do not create perf counter mlock sysctl when
CONFIG_PERF_COUNTERS=n
Building tip from 82811bee3 without CONFIG_PERF_COUNTERS results in:
CC kernel/sysctl.o
kernel/sysctl.c:928: error: 'sysctl_perf_counter_mlock' undeclared here (not in a function)
This is due to c5078f78b "perf_counter: provide an mlock threshold"
Signed-off-by: Ian Campbell <ian.campbell@...rix.com>
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 44ebd90..c2a4467 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -922,6 +922,7 @@ static struct ctl_table kern_table[] = {
.child = slow_work_sysctls,
},
#endif
+#ifdef CONFIG_PERF_COUNTERS
{
.ctl_name = CTL_UNNUMBERED,
.procname = "perf_counter_mlock_kb",
@@ -930,6 +931,7 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
+#endif
/*
* NOTE: do not add new entries to this table unless you have read
* Documentation/sysctl/ctl_unnumbered.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists