From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pdx-out-011.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-011.esa.us-west-2.outbound.mail-perimeter.amazon.com [52.35.192.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AD1330FC1E for ; Sun, 14 Jun 2026 21:40:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.35.192.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781473235; cv=none; b=G7M8TWU0BEKLJALfvrRN2UU2qdl01lxtFhbcIZZGUGHUqSE30pJ0wrXTZYhiZFC8r0UC6Fh1shTRCgCrkRANKUS+pBbiEN4xA4TKj8AttY1tvDYe69ObmXRS0tEiTX8qJZuRQuU4dLleGnE7MAiCLDeat0ZAYXfu0fdO4zlL66Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781473235; c=relaxed/simple; bh=80AV3yd9zf3AUH5igqKkiOddn3e7TmXTVr7pWLoNxa0=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=PCstNuNHygriukHyIi/svWc/aTwsFt5CVu4/J1VDTqCNzIQrF6wg7HG0cplIFFqdFwbLTfYO72KzqPrREuLRX0oR/mo3UJTW8/5sgXHVXFS2vsIX9bY0R9HAM1lR04C5Lmk86Z08yBadQTnv6mOKGD4GLoLSs7wdJYgiRUKfkEc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de; spf=pass smtp.mailfrom=amazon.de; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b=jvq4oO9Y; arc=none smtp.client-ip=52.35.192.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b="jvq4oO9Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazoncorp2; t=1781473234; x=1813009234; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xGysosLt1jP3mZ/7fK+hB/di2UZ82MT4I88TexfBBUQ=; b=jvq4oO9YQcfC8A4Dune67R9QfLLtJQdDeyf5jHz86fBgTT0bb2mZdzkh Ok1K9C48TtEcwPtRwZ2GvFVfcztHLNl1LZbDjetrnfPhm9h97Zt/zXMda ZlhOWmFnsOSCRr8ETSI9ZbGQzYIn5HX8usyN3ifTyb8/NEGvL4scrD84P B8wdEo1FEMTOVvDNdWFJhWshR+5vPrnPncrv8rl1xjdKkMOphZDJcGdaZ KW5xl4VWlisWnvOiQmMT98ws1C9PsRt/zTw4nVoLZIGaY2B0u+nNO5zei yUO57ChfVwZMOwuVE0R0IHokklCQm9NBcsvNudqYSmtmI5s7NrAIkqz9m A==; X-CSE-ConnectionGUID: tF/7JmMwRMS96oVVTMHuaw== X-CSE-MsgGUID: a0RTdaz5TH+GpyjyxnyuLA== X-IronPort-AV: E=Sophos;i="6.24,205,1774310400"; d="scan'208";a="21510096" Received: from ip-10-5-12-219.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.12.219]) by internal-pdx-out-011.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2026 21:40:31 +0000 Received: from EX19MTAUWA001.ant.amazon.com [205.251.233.182:8537] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.63.253:2525] with esmtp (Farcaster) id 751b93b6-bf22-4f6d-9187-f533b9d5060b; Sun, 14 Jun 2026 21:40:31 +0000 (UTC) X-Farcaster-Flow-ID: 751b93b6-bf22-4f6d-9187-f533b9d5060b Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA001.ant.amazon.com (10.250.64.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Sun, 14 Jun 2026 21:40:30 +0000 Received: from dev-dsk-darnshah-1c-a4c7d5e9.eu-west-1.amazon.com (172.19.90.4) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Sun, 14 Jun 2026 21:40:28 +0000 From: Darshit Shah To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , "Mel Gorman" , Valentin Schneider , "K Prateek Nayak" , Tejun Heo CC: Subject: [PATCH RESEND] sched/core: Fix preprocessor #endif statement annotations Date: Sun, 14 Jun 2026 21:40:11 +0000 Message-ID: <20260614214015.20785-1-darnshah@amazon.de> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EX19D039UWA002.ant.amazon.com (10.13.139.32) To EX19D001UWA001.ant.amazon.com (10.13.138.214) Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit A previous patch replaced the conditional CONFIG_CFS_BANDWIDTH with CONFIG_GROUP_SCHED_BANDWIDTH. However, the corresponding #endif statements were not appropriately changed. This commit fixes that. Fixes: ddceadce63d9 ("sched_ext: Add support for cgroup bandwidth control interface") Signed-off-by: Darshit Shah --- kernel/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2f4530eb543f..624995352cce 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -10491,7 +10491,7 @@ static ssize_t cpu_max_write(struct kernfs_open_file *of, ret = tg_set_bandwidth(tg, period_us, quota_us, burst_us); return ret ?: nbytes; } -#endif /* CONFIG_CFS_BANDWIDTH */ +#endif /* CONFIG_GROUP_SCHED_BANDWIDTH */ static struct cftype cpu_files[] = { #ifdef CONFIG_GROUP_SCHED_WEIGHT @@ -10527,7 +10527,7 @@ static struct cftype cpu_files[] = { .read_u64 = cpu_burst_read_u64, .write_u64 = cpu_burst_write_u64, }, -#endif /* CONFIG_CFS_BANDWIDTH */ +#endif /* CONFIG_GROUP_SCHED_BANDWIDTH */ #ifdef CONFIG_UCLAMP_TASK_GROUP { .name = "uclamp.min", -- 2.54.0 Amazon Web Services Development Center Germany GmbH Tamara-Danz-Str. 13 10243 Berlin Geschaeftsfuehrung: Christof Hellmis, Andreas Stieger Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597