From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 13 Sep 2015 09:25:55 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes
X-Git-Tag: v4.4-rc1~155^2~48
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=216dcaf290a5e93426cec283ac9edc67ff6756b3;hp=-c;p=linux.git

Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

216dcaf290a5e93426cec283ac9edc67ff6756b3
diff --combined arch/x86/kernel/cpu/perf_event_intel.c
index cd9b6d0b10bf,f41e4dc78119..3fefebfbdf4b
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@@ -12,7 -12,7 +12,7 @@@
  #include <linux/init.h>
  #include <linux/slab.h>
  #include <linux/export.h>
 -#include <linux/watchdog.h>
 +#include <linux/nmi.h>
  
  #include <asm/cpufeature.h>
  #include <asm/hardirq.h>
@@@ -2316,9 -2316,12 +2316,12 @@@ static struct event_constraint 
  intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
  			    struct perf_event *event)
  {
- 	struct event_constraint *c1 = cpuc->event_constraint[idx];
+ 	struct event_constraint *c1 = NULL;
  	struct event_constraint *c2;
  
+ 	if (idx >= 0) /* fake does < 0 */
+ 		c1 = cpuc->event_constraint[idx];
+ 
  	/*
  	 * first time only
  	 * - static constraint: no change across incremental scheduling calls
@@@ -3627,10 -3630,7 +3630,10 @@@ static __init int fixup_ht_bug(void
  		return 0;
  	}
  
 -	watchdog_nmi_disable_all();
 +	if (lockup_detector_suspend() != 0) {
 +		pr_debug("failed to disable PMU erratum BJ122, BV98, HSD29 workaround\n");
 +		return 0;
 +	}
  
  	x86_pmu.flags &= ~(PMU_FL_EXCL_CNTRS | PMU_FL_EXCL_ENABLED);
  
@@@ -3638,7 -3638,7 +3641,7 @@@
  	x86_pmu.commit_scheduling = NULL;
  	x86_pmu.stop_scheduling = NULL;
  
 -	watchdog_nmi_enable_all();
 +	lockup_detector_resume();
  
  	get_online_cpus();