From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org,
"Paul E. McKenney" <paulmck@linux•vnet.ibm.com>,
Steven Rostedt <rostedt@goodmis•org>
Subject: linux-next: manual merge of the sched tree
Date: Mon, 22 Dec 2008 12:05:43 +1100 [thread overview]
Message-ID: <20081222120543.92004d90.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the sched tree got a conflict in
include/linux/hardirq.h between commit
17666f02b118099028522dfc3df00a235700e216 ("ftrace: nmi safe code
modification") from the ftrace tree and commit
64db4cfff99c04cd5f550357edcc8780f96b54a2 (""Tree RCU": scalable classic
RCU implementation") from the sched tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc include/linux/hardirq.h
index 89a56d7,9b70b92..0000000
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@@ -162,17 -163,7 +164,19 @@@ extern void irq_enter(void)
*/
extern void irq_exit(void);
-#define nmi_enter() do { lockdep_off(); rcu_nmi_enter(); __irq_enter(); } while (0)
-#define nmi_exit() do { __irq_exit(); rcu_nmi_exit(); lockdep_on(); } while (0)
+#define nmi_enter() \
+ do { \
+ ftrace_nmi_enter(); \
+ lockdep_off(); \
++ rcu_nmi_enter(); \
+ __irq_enter(); \
+ } while (0)
+#define nmi_exit() \
+ do { \
+ __irq_exit(); \
++ rcu_nmi_exit(); \
+ lockdep_on(); \
+ ftrace_nmi_exit(); \
+ } while (0)
#endif /* LINUX_HARDIRQ_H */
next reply other threads:[~2008-12-22 1:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-22 1:05 Stephen Rothwell [this message]
2008-12-22 1:46 ` linux-next: manual merge of the sched tree Paul E. McKenney
2008-12-22 6:35 ` Ingo Molnar
2008-12-30 23:45 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-11-19 1:27 Stephen Rothwell
2008-11-19 8:45 ` Ingo Molnar
2008-11-19 9:29 ` Stephen Rothwell
2008-07-22 1:58 Stephen Rothwell
2008-07-22 1:54 Stephen Rothwell
2008-07-22 8:28 ` Stephen Rothwell
2008-07-22 9:13 ` Ingo Molnar
2008-07-22 11:07 ` Stephen Rothwell
[not found] <20080711112146.f7f98434.sfr@canb.auug.org.au>
2008-07-11 8:43 ` Ingo Molnar
[not found] <20080707142114.7985a9dd.sfr@canb.auug.org.au>
2008-07-07 6:02 ` Ingo Molnar
2008-07-07 6:16 ` Ingo Molnar
2008-07-07 6:41 ` Stephen Rothwell
2008-07-07 7:04 ` Ingo Molnar
2008-07-07 6:35 ` Stephen Rothwell
[not found] ` <20080707145027.0d83038e.sfr@canb.auug.org.au>
2008-07-07 6:10 ` Ingo Molnar
2008-07-07 6:37 ` Stephen Rothwell
2008-07-01 2:42 Stephen Rothwell
2008-07-01 5:54 ` Ingo Molnar
2008-07-01 6:00 ` Stephen Rothwell
2008-07-01 6:08 ` Ingo Molnar
2008-06-25 1:55 Stephen Rothwell
2008-06-25 9:36 ` Ingo Molnar
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=20081222120543.92004d90.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=paulmck@linux$(echo .)vnet.ibm.com \
--cc=rostedt@goodmis$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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