From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 00:33:18 +0000 (+1100)
Subject: Merge remote-tracking branch 'mips/mips-for-linux-next'
X-Git-Tag: next-20111214~89
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3fa7a62ecd9888c954e5692460627109ecd982e;p=karo-tx-linux.git

Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
	arch/mips/kernel/perf_event_mipsxx.c
---

b3fa7a62ecd9888c954e5692460627109ecd982e
diff --cc arch/mips/kernel/perf_event_mipsxx.c
index 315fc0b250f8,bda4bc9e6988..e3b897acfbc0
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@@ -731,16 -710,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;
  }