Subject: linux-next: manual merge of the oprofile tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 1 Oct 2010 13:53:01 +1000

Hi Robert,

Today's linux-next merge of the oprofile tree got a conflict in
arch/arm/oprofile/common.c between commit
98d943b02f6f1b57787ff1aa6f34d019a407e3ee ("oprofile, ARM: Release
resources on failure") from the tip tree and commit
c7fd239a647ead1c336a051012d6bb96465ea8c6 ("ARM: oprofile: fix and
simplify init/exit functions") from the oprofile tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/arm/oprofile/common.c
index d1fb5b2,d660cb8..0000000
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@@ -395,6 -393,13 +394,14 @@@ int __init oprofile_arch_init(struct op
  	else
  		pr_info("oprofile: using %s\n", ops->cpu_type);
  
+ out:
+ 	if (ret) {
+ 		for_each_possible_cpu(cpu)
+ 			kfree(perf_events[cpu]);
+ 		kfree(counter_config);
++		counter_config = NULL;
+ 	}
+ 
  	return ret;
  }