From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DC38C433E1 for ; Mon, 29 Jun 2020 20:24:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63E4920656 for ; Mon, 29 Jun 2020 20:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593462298; bh=JPSD4BtgicOFfZH9DkQyNOqcrCw79aH4Ed1d2ZfYyZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wvO0NPQRwMETPpkAPDhq4KMS41D44cu+MuaSUrN0At6wRk+slHEHTArQ1qZPvjhaO IcUFQKRUY2QCy92ra0IBOFiaViTa5MjUgcoyNd/tq7WIIYJ7jMI75EBekAcCwfpOvd UAvU3qUhNh+IUGbSF31J/6YtdsKyjEIBgzflo3AA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729447AbgF2UY4 (ORCPT ); Mon, 29 Jun 2020 16:24:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:37040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732544AbgF2TZ2 (ORCPT ); Mon, 29 Jun 2020 15:25:28 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 591DF253F1; Mon, 29 Jun 2020 15:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445336; bh=JPSD4BtgicOFfZH9DkQyNOqcrCw79aH4Ed1d2ZfYyZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HVZ+zNx6HSKJcl1FGG2hT0MD95ROpQPheuuf5NMxPwm0crna8noyRLBOaYUfXyJ5H GHRPKJIMrwxG+6PsCClGoPv8LX0h4NEtoJl6gYNmYresugok50w1Q89AFom4wdKjf5 +29aofU+ibGHb9D0v+M6wC+KLW5dSzqDC0+m1CWU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Gleixner , Sebastian Andrzej Siewior , "David S . Miller" , Linus Torvalds , Peter Zijlstra , netdev@vger.kernel.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.9 097/191] sched/rt, net: Use CONFIG_PREEMPTION.patch Date: Mon, 29 Jun 2020 11:38:33 -0400 Message-Id: <20200629154007.2495120-98-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629154007.2495120-1-sashal@kernel.org> References: <20200629154007.2495120-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:39+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Gleixner [ 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 Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Acked-by: David S. Miller Cc: Linus Torvalds Cc: Peter Zijlstra Cc: netdev@vger.kernel.org Link: https://lore.kernel.org/r/20191015191821.11479-22-bigeasy@linutronix.de Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- 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 1041523aaa76e..86f69ff758250 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -869,7 +869,7 @@ EXPORT_SYMBOL(dev_get_by_index); * * 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