From patchwork Mon Sep 18 07:45:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 141320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2525273vqi; Mon, 18 Sep 2023 02:19:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYGuKNKE3RddpWwoKqUM9KCHcgJbddDY17wDUh6aHNLbmjY8PCFYhWcRfhfmJQJFVooH+3 X-Received: by 2002:a17:90a:3ea5:b0:276:6b9d:7503 with SMTP id k34-20020a17090a3ea500b002766b9d7503mr1363017pjc.28.1695028775095; Mon, 18 Sep 2023 02:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695028775; cv=none; d=google.com; s=arc-20160816; b=ppjJmhwz3ufgbZUa3WoVNNpj9ht3a6fxWT0cFLglUs+O9X/0dwFKl45sWecXD9HVD7 QHlLmA/etY0gpPCZacyyQbtBd1UmfiE562sd0qACZRND2H2C8rGHWJaHEo5EVzEQ26/8 BvX3Ze5IlvOizhaUzJf5TpENOhFc0XljHAeIbQ6fN3NDLGzQMkreMo2OdVdKgPCRyc7K NYR+miMZMzkJhFO/2ode/Oi+LKVG5QLHpFpEY2wSNRYumVzjP5cCLLaGtLxjW+KH1iGp GFDt1yafV5xGRjjaiw7sSToJ+1TRI1dc+WVYF3k2YF/upAatAT0lH0ZNuoDwwMwIlY7O +9RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=zUb2/FWSHOkypAisRqXH49SPDxQ0fESsbVzSr5ZK9sY=; fh=Yyy54jaP1Egaa/HzH6Kl7LCnXc14rjglG43SuUMijak=; b=M82KGG0uuXVsj/jBmChfQekak3URJkQW6BSen4F2J12EKwaZvczC4+W9QR/PzkfDvf cMn0pCt5/dKnz66aao43bskng6PDZHUIGxDYYpxzvwNKK90ocJGQ6Xv0dXf1uWUYAzF2 pxO1eE+o8+bq41V191bdPmbK26c6sMHrBnaOGUGyF9vIz1LpqlPYKZ5xHdnbEwSa4Iun GFqWlkW+jPnt3qKihkrmNLiscq1s3IlY3CdkF+GmO4gyPjvh2Sm0MJxH0pho5f3q1DlE rBRvxhuLlWRbl7aed5BrBNFBzneZmrn8dWWmmTIGp6jKZrv1bqLqOg0qdSpLO1zKC9LV H4JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Uc1lrIHl; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=mFQMZPvB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id np9-20020a17090b4c4900b00273fde2471esi10587080pjb.88.2023.09.18.02.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 02:19:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Uc1lrIHl; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=mFQMZPvB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1B4BC80732B8; Mon, 18 Sep 2023 00:49:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240271AbjIRHtO (ORCPT + 27 others); Mon, 18 Sep 2023 03:49:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240446AbjIRHss (ORCPT ); Mon, 18 Sep 2023 03:48:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB2E8191; Mon, 18 Sep 2023 00:45:47 -0700 (PDT) Date: Mon, 18 Sep 2023 07:45:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695023144; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zUb2/FWSHOkypAisRqXH49SPDxQ0fESsbVzSr5ZK9sY=; b=Uc1lrIHlM0yRMPZNphkJQsS+OxPlF9cd2TJibdgJILlHFpZhzeEgQFyjiwdV/kSh4a3Fob gKTFVKxpLUWpK3wWvJkEh+wQHKr4qlyaT9Vs3S79vmwyCcJDU3ltWwNBGdMI2zIGAO/wAm RARPdFaeRYLLzZJEbA32eyIaStsOcSR87smCJXxJzMI+gvLhdMhkwDvkEnVY5HZf2tMP5W u8i9idx4ShJufhGhmqR78Jxk/8dRo8a/1+jzmiSm+lrKIMaTOS5LH1GC2E93XanpBd7csD QIKVfiHaE2ic8CPPh5tCvwtTIChOxq/sGrDiIHy0FsaoqfpXulGL/ZCJsx3mJA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695023144; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zUb2/FWSHOkypAisRqXH49SPDxQ0fESsbVzSr5ZK9sY=; b=mFQMZPvBsYcX+nKU0r+7SzJg8NqFtpWicztE9sxCsULXvTW5fOFxFkjcNUao+N5tpXffas OVke34XzWj9e45DQ== From: "tip-bot2 for GUO Zihua" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/headers: Remove duplicated includes in kernel/sched/sched.h Cc: GUO Zihua , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230818015633.18370-1-guozihua@huawei.com> References: <20230818015633.18370-1-guozihua@huawei.com> MIME-Version: 1.0 Message-ID: <169502314296.27769.160204530264678474.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 18 Sep 2023 00:49:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777366493009271756 X-GMAIL-MSGID: 1777366493009271756 The following commit has been merged into the sched/core branch of tip: Commit-ID: 7ad0354d18ae05e9c8885251e234cbcf141f8972 Gitweb: https://git.kernel.org/tip/7ad0354d18ae05e9c8885251e234cbcf141f8972 Author: GUO Zihua AuthorDate: Fri, 18 Aug 2023 09:56:33 +08:00 Committer: Ingo Molnar CommitterDate: Mon, 18 Sep 2023 09:41:37 +02:00 sched/headers: Remove duplicated includes in kernel/sched/sched.h Remove duplicated includes of linux/cgroup.h and linux/psi.h. Both of these includes are included regardless of the config and they are all protected by ifndef, so no point including them again. Signed-off-by: GUO Zihua Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230818015633.18370-1-guozihua@huawei.com --- kernel/sched/sched.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 887468c..5f217b1 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -74,15 +74,6 @@ #include "../workqueue_internal.h" -#ifdef CONFIG_CGROUP_SCHED -#include -#include -#endif - -#ifdef CONFIG_SCHED_DEBUG -# include -#endif - #ifdef CONFIG_PARAVIRT # include # include