From: tip-bot for Peter Zijlstra <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, paulmck@linux.vnet.ibm.com,
markus@trippelsdorf.de, dipankar@in.ibm.com, tglx@linutronix.de
Subject: [tip:sched/urgent] sched/preempt/x86: Fix voluntary preempt for x86
Date: Thu, 23 Jan 2014 08:46:34 -0800 [thread overview]
Message-ID: <tip-215393bc1fab3d61a5a296838bdffce22f27ffda@git.kernel.org> (raw)
In-Reply-To: <20140122102435.GH31570@twins.programming.kicks-ass.net>
Commit-ID: 215393bc1fab3d61a5a296838bdffce22f27ffda
Gitweb: http://git.kernel.org/tip/215393bc1fab3d61a5a296838bdffce22f27ffda
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 22 Jan 2014 11:24:35 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 23 Jan 2014 14:48:35 +0100
sched/preempt/x86: Fix voluntary preempt for x86
The #ifdef CONFIG_PREEMPT is both not needed and wrong.
Its not required because asm/preempt.h should provide
{set,clear}_preempt_need_resched() regardless and its wrong because
for voluntary preempt we still rely on PREEMPT_NEED_RESCHED.
Reported-and-Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Fixes: 8cb75e0c4ec9 ("sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding")
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20140122102435.GH31570@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/preempt.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 59749fc..de83b4e 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -134,7 +134,6 @@ do { \
#undef preempt_check_resched
#endif
-#ifdef CONFIG_PREEMPT
#define preempt_set_need_resched() \
do { \
set_preempt_need_resched(); \
@@ -144,10 +143,6 @@ do { \
if (tif_need_resched()) \
set_preempt_need_resched(); \
} while (0)
-#else
-#define preempt_set_need_resched() do { } while (0)
-#define preempt_fold_need_resched() do { } while (0)
-#endif
#ifdef CONFIG_PREEMPT_NOTIFIERS
prev parent reply other threads:[~2014-01-23 16:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-21 21:51 qemu hangs on current git Markus Trippelsdorf
2014-01-22 8:50 ` Markus Trippelsdorf
2014-01-22 9:37 ` [Bisected] " Markus Trippelsdorf
2014-01-22 10:24 ` Peter Zijlstra
2014-01-22 11:44 ` Markus Trippelsdorf
2014-01-22 11:54 ` Peter Zijlstra
2014-01-23 16:46 ` tip-bot for Peter Zijlstra [this message]
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=tip-215393bc1fab3d61a5a296838bdffce22f27ffda@git.kernel.org \
--to=tipbot@zytor.com \
--cc=dipankar@in.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=markus@trippelsdorf.de \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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