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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C72FC7EE23 for ; Mon, 8 May 2023 11:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236202AbjEHLo4 (ORCPT ); Mon, 8 May 2023 07:44:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236253AbjEHLof (ORCPT ); Mon, 8 May 2023 07:44:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DD5F429E3 for ; Mon, 8 May 2023 04:44:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 120F96206E for ; Mon, 8 May 2023 11:43:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05F65C433A4; Mon, 8 May 2023 11:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683546211; bh=BF0II4A0ry5/qNylK3e3ADVEGuTPlHMXERqjd/pfHBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J9aiHZXNtjrI1GiMgQA+kg3ujQd0ZzLtUhRFXOWkTGx8gEI7Vy6XsS8kYn3nCeJX/ k8feGbdgCfoBzqMdOeeqFeQNjMXUPiceMuiIahBvvKuSXbo5tbCZi17e5rgtOgn7iG TtkOm9VFlIs7/4vBZKUyT9vTMfH2HRYqtX829k6M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yafang Shao , "Peter Zijlstra (Intel)" , Mel Gorman , Sasha Levin Subject: [PATCH 5.15 286/371] sched/fair: Use __schedstat_set() in set_next_entity() Date: Mon, 8 May 2023 11:48:07 +0200 Message-Id: <20230508094823.366478047@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230508094811.912279944@linuxfoundation.org> References: <20230508094811.912279944@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yafang Shao [ Upstream commit a2dcb276ff9287fcea103ca1a2436383e8583751 ] schedstat_enabled() has been already checked, so we can use __schedstat_set() directly. Signed-off-by: Yafang Shao Signed-off-by: Peter Zijlstra (Intel) Acked-by: Mel Gorman Link: https://lore.kernel.org/r/20210905143547.4668-2-laoar.shao@gmail.com Stable-dep-of: 39afe5d6fc59 ("sched/fair: Fix inaccurate tally of ttwu_move_affine") Signed-off-by: Sasha Levin --- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 591fdc81378e0..70f7a3896a90c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4691,9 +4691,9 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) */ if (schedstat_enabled() && rq_of(cfs_rq)->cfs.load.weight >= 2*se->load.weight) { - schedstat_set(se->statistics.slice_max, - max((u64)schedstat_val(se->statistics.slice_max), - se->sum_exec_runtime - se->prev_sum_exec_runtime)); + __schedstat_set(se->statistics.slice_max, + max((u64)se->statistics.slice_max, + se->sum_exec_runtime - se->prev_sum_exec_runtime)); } se->prev_sum_exec_runtime = se->sum_exec_runtime; -- 2.39.2