From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Paul E. McKenney" <paulmck@linux•vnet.ibm.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 workqueues tree with the tip tree
Date: Tue, 20 Jul 2010 14:46:43 +1000 [thread overview]
Message-ID: <20100720144643.970abee5.sfr@canb.auug.org.au> (raw)
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
include/linux/workqueue.h between commit
a25909a4d4a29e272f953e12595bf2f04a292dbd ("lockdep: Add an
in_workqueue_context() lockdep-based test function") from the tip tree
and commit a0a1a5fd4fb15ec61117c759fe9f5c16c53d9e9c ("workqueue:
reimplement workqueue freeze using max_active") from the workqueues tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/workqueue.h
index d0f7c81,d74a529..0000000
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@@ -298,7 -394,10 +394,14 @@@ static inline long work_on_cpu(unsigne
long work_on_cpu(unsigned int cpu, long (*fn)(void *), void *arg);
#endif /* CONFIG_SMP */
+#ifdef CONFIG_LOCKDEP
+int in_workqueue_context(struct workqueue_struct *wq);
+#endif
++
+ #ifdef CONFIG_FREEZER
+ extern void freeze_workqueues_begin(void);
+ extern bool freeze_workqueues_busy(void);
+ extern void thaw_workqueues(void);
+ #endif /* CONFIG_FREEZER */
+
#endif
next reply other threads:[~2010-07-20 4:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-20 4:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-18 4:08 linux-next: manual merge of the workqueues tree with the tip tree Stephen Rothwell
2019-11-18 9:00 ` Sebastian Andrzej Siewior
2019-11-18 12:50 ` Ingo Molnar
2019-11-18 14:56 ` Paul E. McKenney
2019-11-18 15:09 ` Tejun Heo
2011-12-28 4:37 Stephen Rothwell
2010-12-27 4:38 Stephen Rothwell
2010-08-02 3:26 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2009-11-26 8:00 Stephen Rothwell
2009-11-26 8:12 ` Ingo Molnar
2009-11-26 9:15 ` Tejun Heo
2009-11-26 9:26 ` Ingo Molnar
2009-11-26 9:48 ` Tejun Heo
2009-11-26 9:51 ` 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=20100720144643.970abee5.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=paulmck@linux$(echo .)vnet.ibm.com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
/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