diff --git a/[refs] b/[refs]
index 3e7ed5548629..07c2a5ce1a1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da1a776be1ac7f78bb30ececbec4c1383163b079
+refs/heads/master: 829b42dd395c5801f6ae87da87ecbdcfd5ef1a6c
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
index 981432885301..be10b3ffe320 100644
--- a/trunk/include/linux/perf_counter.h
+++ b/trunk/include/linux/perf_counter.h
@@ -512,12 +512,13 @@ struct perf_cpu_context {
 	int			recursion[4];
 };
 
+#ifdef CONFIG_PERF_COUNTERS
+
 /*
  * Set by architecture code:
  */
 extern int perf_max_counters;
 
-#ifdef CONFIG_PERF_COUNTERS
 extern const struct hw_perf_counter_ops *
 hw_perf_counter_init(struct perf_counter *counter);