diff options
| author | Ingo Molnar | 2016-04-23 14:12:10 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2016-04-23 14:12:10 +0200 |
| commit | 65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch) | |
| tree | 02b22c99008630010f28f45f502f55915f1014c2 /kernel/events/core.c | |
| parent | Merge tag 'perf-core-for-mingo-20160415' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | perf/core: Make sysctl_perf_cpu_time_max_percent conform to documentation (diff) | |
| download | kernel-qcow2-linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.gz kernel-qcow2-linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.xz kernel-qcow2-linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/core.c')
| -rw-r--r-- | kernel/events/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 8c3b35f2a269..21ba024c9ed1 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -412,7 +412,8 @@ int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, if (ret || !write) return ret; - if (sysctl_perf_cpu_time_max_percent == 100) { + if (sysctl_perf_cpu_time_max_percent == 100 || + sysctl_perf_cpu_time_max_percent == 0) { printk(KERN_WARNING "perf: Dynamic interrupt throttling disabled, can hang your system!\n"); WRITE_ONCE(perf_sample_allowed_ns, 0); |