Ingo Molnar 44530d588e Revert "perf/x86/intel, watchdog: Switch NMI watchdog to ref cycles on x86" ... This reverts commit 2c95afc1e8. Stephane reported the following regression: > Since Andi added: > > commit 2c95afc1e8 > Author: Andi Kleen <ak@linux.intel.com> > Date: Thu Jun 9 06:14:38 2016 -0700 > > perf/x86/intel, watchdog: Switch NMI watchdog to ref cycles on x86 > > $ perf stat -e ref-cycles ls > <not counted> .... > > fails systematically because the ref-cycles is now used by the > watchdog and given this is a system-wide pinned event, it monopolizes > the fixed counter 2 which is the only counter able to measure this event. Since the next merge window is near, fix the regression for now by reverting the commit. Reported-by: Stephane Eranian <eranian@google.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>		2016-07-10 20:58:36 +02:00
..
acpi	Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor'	2016-06-03 22:35:05 +02:00
asm-generic	locking/qspinlock: Fix spin_unlock_wait() some more	2016-06-08 14:29:08 +02:00
clocksource
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-05-19 09:21:36 -07:00
drm	drm/i915: Removing PCI IDs that are no longer listed as Kabylake.	2016-06-29 12:19:13 +03:00
dt-bindings	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2016-05-26 09:23:43 -07:00
keys
kvm	arm64: KVM: fix build with CONFIG_ARM_PMU disabled	2016-06-27 12:55:51 +02:00
linux	Revert "perf/x86/intel, watchdog: Switch NMI watchdog to ref cycles on x86"	2016-07-10 20:58:36 +02:00
math-emu
media	Update my main e-mails at the Kernel tree	2016-06-15 15:35:37 -10:00
memory
misc	cxl: Add kernel API to allow a context to operate with relocate disabled	2016-05-11 21:54:10 +10:00
net	act_ife: only acquire tcf_lock for existing actions	2016-06-23 12:02:36 -04:00
pcmcia
ras
rdma	IB/rdmavt: Correct qp_priv_alloc() return value test	2016-06-23 10:16:15 -04:00
rxrpc
scsi	Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac	2016-05-09 12:34:39 -04:00
soc	ARC updates for 4.7-rc1	2016-05-19 09:46:18 -07:00
sound	ASoC: Updates for v4.7	2016-05-16 14:59:00 +02:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-05-28 12:04:17 -07:00
trace	- move kvm_stat tool from QEMU repo into tools/kvm/kvm_stat	2016-05-27 13:41:54 -07:00
uapi	Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes	2016-07-07 08:58:23 +02:00
video	imx-drm probing fix	2016-05-25 12:36:20 +10:00
xen
Kbuild