Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt: "Here is not quite a handful of powerpc fixes for rc3. The windfarm fix is a regression fix (though not a new one), the PMU interrupt rename is not a fix per-se but has been submitted a long time ago and I kept forgetting to put it in (it puts us back in sync with x86), the other perf bit is just about putting an API/ABI bit definition in the right place for userspace to consume, and finally, we have a fix for the VPHN (Virtual Partition Home Node) feature (notification that the hypervisor is moving nodes around) which could cause lockups so we may as well fix it now" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31) powerpc: VPHN topology change updates all siblings powerpc/perf: Export PERF_EVENT_CONFIG_EBB_SHIFT to userspace powerpc: Rename PMU interrupts from CNT to PMI
Showing
- arch/powerpc/include/asm/perf_event_server.h 1 addition, 5 deletionsarch/powerpc/include/asm/perf_event_server.h
- arch/powerpc/include/asm/smp.h 4 additions, 0 deletionsarch/powerpc/include/asm/smp.h
- arch/powerpc/include/uapi/asm/Kbuild 1 addition, 0 deletionsarch/powerpc/include/uapi/asm/Kbuild
- arch/powerpc/include/uapi/asm/perf_event.h 18 additions, 0 deletionsarch/powerpc/include/uapi/asm/perf_event.h
- arch/powerpc/kernel/irq.c 1 addition, 1 deletionarch/powerpc/kernel/irq.c
- arch/powerpc/mm/numa.c 44 additions, 15 deletionsarch/powerpc/mm/numa.c
- arch/powerpc/perf/core-book3s.c 1 addition, 1 deletionarch/powerpc/perf/core-book3s.c
- arch/powerpc/perf/power8-pmu.c 3 additions, 3 deletionsarch/powerpc/perf/power8-pmu.c
- drivers/macintosh/windfarm_rm31.c 9 additions, 9 deletionsdrivers/macintosh/windfarm_rm31.c
Loading
Please register or sign in to comment