diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 09:32:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 09:32:39 -0700 |
| commit | c7c3ae2596d19ad0ed82f30d0e76a4b201b6b0a8 (patch) | |
| tree | db4d4f88a148e4be80392cae5d4ff36d3759b541 /arch/s390/pci/pci_event.c | |
| parent | 85d90faed31ec74fb28a450fbc368d982a785924 (diff) | |
| parent | f56029410a13cae3652d1f34788045c40a13ffc7 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt:
"Here are a few more powerpc fixes for 3.16
There's a small series of 3 patches that fix saving/restoring MMUCR2
when using KVM without which perf goes completely bonkers in the host
system. Another perf fix from Anton that's been rotting away in
patchwork due to my poor eyesight, a couple of compile fixes, a little
addition to the WSP removal by Michael (removing a bit more dead
stuff) and a fix for an embarassing regression with our soft irq
masking"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/perf: Never program book3s PMCs with values >= 0x80000000
powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64
powerpc/perf: Clear MMCR2 when enabling PMU
powerpc/perf: Add PPMU_ARCH_207S define
powerpc/kvm: Remove redundant save of SIER AND MMCR2
powerpc/powernv: Check for IRQHAPPENED before sleeping
powerpc: Clean up MMU_FTRS_A2 and MMU_FTR_TYPE_3E
powerpc/cell: Fix compilation with CONFIG_COREDUMP=n
Diffstat (limited to 'arch/s390/pci/pci_event.c')
0 files changed, 0 insertions, 0 deletions