From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 28 Sep 2015 06:06:57 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
X-Git-Tag: v4.14-rc1~4450^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6afc0c269c3d20cde05515b00ede00e91fee0be5;p=platform%2Fkernel%2Flinux-rpi.git

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

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

6afc0c269c3d20cde05515b00ede00e91fee0be5
diff --cc arch/s390/kernel/perf_cpum_cf.c
index cb774ff,a956340..929c147
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@@ -536,9 -538,9 +540,9 @@@ static int cpumf_pmu_add(struct perf_ev
  	 * For group events transaction, the authorization check is
  	 * done in cpumf_pmu_commit_txn().
  	 */
 -	if (!(cpuhw->flags & PERF_EVENT_TXN))
 +	if (!(cpuhw->txn_flags & PERF_PMU_TXN_ADD))
  		if (validate_ctr_auth(&event->hw))
- 			return -EPERM;
+ 			return -ENOENT;
  
  	ctr_set_enable(&cpuhw->state, event->hw.config_base);
  	event->hw.state = PERF_HES_UPTODATE | PERF_HES_STOPPED;
@@@ -636,9 -615,9 +640,9 @@@ static int cpumf_pmu_commit_txn(struct 
  	state = cpuhw->state & ~((1 << CPUMF_LCCTL_ENABLE_SHIFT) - 1);
  	state >>= CPUMF_LCCTL_ENABLE_SHIFT;
  	if ((state & cpuhw->info.auth_ctl) != state)
- 		return -EPERM;
+ 		return -ENOENT;
  
 -	cpuhw->flags &= ~PERF_EVENT_TXN;
 +	cpuhw->txn_flags = 0;
  	perf_pmu_enable(pmu);
  	return 0;
  }