From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Robert Richter <robert.richter@amd•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Will Deacon <will.deacon@arm•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: linux-next: manual merge of the oprofile tree with the tip tree
Date: Fri, 1 Oct 2010 13:53:01 +1000 [thread overview]
Message-ID: <20101001135301.5307c860.sfr@canb.auug.org.au> (raw)
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 sfr@canb•auug.org.au
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;
}
next reply other threads:[~2010-10-01 3:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 3:53 Stephen Rothwell [this message]
2010-10-01 13:21 ` linux-next: manual merge of the oprofile tree with the tip tree Robert Richter
-- strict thread matches above, loose matches on Subject: below --
2010-10-12 2:13 Stephen Rothwell
2010-10-12 2:18 Stephen Rothwell
2010-10-12 6:03 ` Matt Fleming
2010-10-12 12:23 ` Stephen Rothwell
2010-10-12 12:51 ` Matt Fleming
2010-10-15 12:43 ` Robert Richter
2012-03-13 6:37 Stephen Rothwell
2012-03-13 8:31 ` Ingo Molnar
2012-03-21 5:31 Stephen Rothwell
2012-03-21 12:33 ` Robert Richter
2012-03-21 13:52 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101001135301.5307c860.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=robert.richter@amd$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox