From e34479c03915e55df94cbeec7e4c389ab32bf4c8 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 24 May 2009 09:02:37 +0200
Subject: [PATCH] --- yaml --- r: 147494 b: refs/heads/master c:
 a3862d3f814ce7dfca9eed56ac23d29db3aee8d5 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/perf_counter.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff42bda28629..3a579fa13c37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2990a2a582d73562d4dcf2502c39892a19a691d
+refs/heads/master: a3862d3f814ce7dfca9eed56ac23d29db3aee8d5
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
index cb4062559b47..6cdf8248eda2 100644
--- a/trunk/kernel/perf_counter.c
+++ b/trunk/kernel/perf_counter.c
@@ -1704,6 +1704,12 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
 
 	user_extra = nr_pages + 1;
 	user_lock_limit = sysctl_perf_counter_mlock >> (PAGE_SHIFT - 10);
+
+	/*
+	 * Increase the limit linearly with more CPUs:
+	 */
+	user_lock_limit *= num_online_cpus();
+
 	user_locked = atomic_long_read(&user->locked_vm) + user_extra;
 
 	extra = 0;