| From 8076d1530673f6a6f056ac86b77fbbaff5b24153 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 15 Oct 2019 21:18:08 +0200 |
| Subject: sched/rt, net: Use CONFIG_PREEMPTION.patch |
| |
| From: Thomas Gleixner <tglx@linutronix.de> |
| |
| [ 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> |
| --- |
| net/core/dev.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/core/dev.c b/net/core/dev.c |
| index ed552ad3f7834..9e4a00462f5c7 100644 |
| --- a/net/core/dev.c |
| +++ b/net/core/dev.c |
| @@ -901,7 +901,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) |
| { |
| -- |
| 2.25.1 |
| |