aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-10-15 21:18:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-25 15:33:10 +0200
commitb855db2a128ae5d003e03e1b7e7faf8d88b02134 (patch)
tree16b9c3fc415471d30e1a9022450141658458cd47
parent98abe944f93faf19c3707f8f188df5073e5668f8 (diff)
downloadlinux-yocto-b855db2a128ae5d003e03e1b7e7faf8d88b02134.tar.gz
linux-yocto-b855db2a128ae5d003e03e1b7e7faf8d88b02134.tar.bz2
linux-yocto-b855db2a128ae5d003e03e1b7e7faf8d88b02134.zip
sched/rt, net: Use CONFIG_PREEMPTION.patch
[ Upstream commit 2da2b32fd9346009e9acdb68c570ca8d3966aba7 ] CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT. Update the comment to use CONFIG_PREEMPTION. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: David S. Miller <davem@davemloft.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: netdev@vger.kernel.org Link: https://lore.kernel.org/r/20191015191821.11479-22-bigeasy@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 50498a75c04b..8db77e09387b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -902,7 +902,7 @@ EXPORT_SYMBOL(dev_get_by_napi_id);
*
* The use of raw_seqcount_begin() and cond_resched() before
* retrying is required as we want to give the writers a chance
- * to complete when CONFIG_PREEMPT is not set.
+ * to complete when CONFIG_PREEMPTION is not set.
*/
int netdev_get_name(struct net *net, char *name, int ifindex)
{