linux-kernel - linux-next: manual merge of the tip tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111123130148.2a437aabdf6120e7e9b6928c@canb.auug.org.au>
Date:	Wed, 23 Nov 2011 13:01:48 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Deng-Cheng Zhu <dczhu@...s.com>,
	Ralf Baechle <ralf@...ux-mips.org>
Subject: linux-next: manual merge of the tip tree with the mips tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/kernel/perf_event_mipsxx.c between commit f40c522a4216
("MIPS/Perf-events: Remove erroneous check on active_events") and
c481e48d9478 ("MIPS/Perf-events: Remove pmu and event state checking in
validate_event()") from the mips tree and commit aa2bc1ade590 ("perf:
Don't use -ENOSPC for out of PMU resources") from the tip tree.

Just context changes (and one hunk was removed).  I fixed it up (see
below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/mips/kernel/perf_event_mipsxx.c
index bda4bc9,315fc0b..0000000
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@@ -710,16 -731,16 +710,16 @@@ static int validate_group(struct perf_e
  
  	memset(&fake_cpuc, 0, sizeof(fake_cpuc));
  
 -	if (!validate_event(&fake_cpuc, leader))
 +	if (mipsxx_pmu_alloc_counter(&fake_cpuc, &leader->hw) < 0)
- 		return -ENOSPC;
+ 		return -EINVAL;
  
  	list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
 -		if (!validate_event(&fake_cpuc, sibling))
 +		if (mipsxx_pmu_alloc_counter(&fake_cpuc, &sibling->hw) < 0)
- 			return -ENOSPC;
+ 			return -EINVAL;
  	}
  
 -	if (!validate_event(&fake_cpuc, event))
 +	if (mipsxx_pmu_alloc_counter(&fake_cpuc, &event->hw) < 0)
- 		return -ENOSPC;
+ 		return -EINVAL;
  
  	return 0;
  }

Content of type "application/pgp-signature" skipped