From: Grant Grundler <iod00d@hp.com>
To: linux-ia64@vger.kernel.org
Subject: [PATCH] 2.6.10-rc1 pfmon broken by bad merge?
Date: Thu, 18 Nov 2004 23:01:18 +0000 [thread overview]
Message-ID: <20041118230118.GC15892@esmail.cup.hp.com> (raw)
Tony,
Just pulled/rebuilt from the bk linux-ia64-release-2.6.10 tree
and it failed to build with :
arch/ia64/kernel/perfmon.c: In function `pfm_handle_work':
arch/ia64/kernel/perfmon.c:5068: error: parse error before '/' token
Following trivial patch fixes what looks like a merge bug.
Signed-off-by: Grant Grundler <iod00d@hp.com>
grant
=== arch/ia64/kernel/perfmon.c 1.100 vs edited ==--- 1.100/arch/ia64/kernel/perfmon.c 2004-11-18 10:43:37 -08:00
+++ edited/arch/ia64/kernel/perfmon.c 2004-11-18 14:58:03 -08:00
@@ -5065,7 +5065,7 @@
* when returning to user level (PUStk=1), in which case
* there is no risk of kernel stack overflow due to deep
* interrupt nesting.
- */ */
+ */
BUG_ON(flags & IA64_PSR_I);
local_irq_enable();
next reply other threads:[~2004-11-18 23:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-18 23:01 Grant Grundler [this message]
2004-11-18 23:46 ` [PATCH] 2.6.10-rc1 pfmon broken by bad merge? Stephane Eranian
2004-11-19 6:35 ` Luck, Tony
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=20041118230118.GC15892@esmail.cup.hp.com \
--to=iod00d@hp.com \
--cc=linux-ia64@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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