diff --git a/[refs] b/[refs]
index 3a579fa13c37..9cb3aacfdb22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3862d3f814ce7dfca9eed56ac23d29db3aee8d5
+refs/heads/master: 85a9f9200226ddffc2ea50dae6a8df04c033ecd4
diff --git a/trunk/Documentation/perf_counter/perf.h b/trunk/Documentation/perf_counter/perf.h
index a517683fc661..5a2520bb7e55 100644
--- a/trunk/Documentation/perf_counter/perf.h
+++ b/trunk/Documentation/perf_counter/perf.h
@@ -61,8 +61,8 @@ sys_perf_counter_open(struct perf_counter_hw_event *hw_event_uptr,
 		       group_fd, flags);
 }
 
-#define MAX_COUNTERS			1024
-#define MAX_NR_CPUS			4096
+#define MAX_COUNTERS			256
+#define MAX_NR_CPUS			256
 
 #define EID(type, id) (((__u64)(type) << PERF_COUNTER_TYPE_SHIFT) | (id))