Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3034109ybt; Mon, 29 Jun 2020 13:28:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPAJjyDXGj7tQvGBbnyKYF/D/9aY9WRyh8C3itNSHR61TtVb7ri8XypmH5J4qhFk/DGe5n X-Received: by 2002:aa7:db11:: with SMTP id t17mr18864520eds.365.1593462534856; Mon, 29 Jun 2020 13:28:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593462534; cv=none; d=google.com; s=arc-20160816; b=xHOQL7tiTCrTsxioI66I9yTnooG/nEfavk9wJ5DkF+Lu7UWkixsHns+f82pBe18/uz l1sYL8J0pPLY7bNZSnoSlmUrU6Y+/jVVLLweI1lJ5N58VHMvjEZA40hgX7T7eKWRV970 fdCRsC9630n12Tg/5In1fYpc9vVp88nDeDbx7OXpnouT01DgVI5LQETq8vCEeajiTX2L vx6gIdw6GaZ6sOJIDBUi9oxno8cMb/fiRZTKe361nx/pp83+Nxjqwj6Vf4aMuTpqjPkb QFIxMclAUC36yEamO5FNNQJS/5PlO52+Ff65lHaDNdhH7xA2HN3iTMec1zJKdwe9gj0k wsyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UyGqVluJ4XdY5tHTIU4wFtEmUHfwX2OQMrxE9jgS0VA=; b=UfHu6RXNIRndtb8ffyY7yEGnXlAspgBfKUdi6sdVEeTAJIwILMjRVU32gnAq3DmXcg QX6fWLC/qCj69rL9gZt64EknNZDRDlkqr0o3zTbBXLpuXoiFHdAIypwgNgJs3+/fEfkV hrMFLQ2zE7kRAf86XVdRo8T2zAPaWtFCcFV+89lCRAf1NwyYHJJkKi7mkbfvOyY+8bgK dmLHMaya2S5kBPwBE6TMDDItvAL2V9HnzGSFqGYoeoF5pdSbdsRpe0smoLNXquL/E1y1 aTBiZHDC7xi8KXxWtaGWHSTBshqjdRMaYz+vek7Y9dm9QdqUHhGhPrPplK/R5ZOOJCd8 gpGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HVZ+zNx6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v12si391227eje.201.2020.06.29.13.28.31; Mon, 29 Jun 2020 13:28:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HVZ+zNx6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388989AbgF2UY6 (ORCPT + 99 others); Mon, 29 Jun 2020 16:24:58 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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