Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / arch / s390 / kernel / perf_cpum_sf.c

diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index b878f12a9597201476ffda4aabaf676f66735b99..c3f8d157cb0d11898bbd72d103dd7b4aceb4b654 100644 (file)
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1383,7 +1383,6 @@ static int cpumsf_pmu_add(struct perf_event *event, int flags)
                cpuhw->lsctl.ed = 1;
 
        /* Set in_use flag and store event */
-       event->hw.idx = 0;        /* only one sampling event per CPU supported */
        cpuhw->event = event;
        cpuhw->flags |= PMU_F_IN_USE;