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=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 B26B9C4361A for ; Tue, 2 Mar 2021 09:35:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 65E256148E for ; Tue, 2 Mar 2021 09:35:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382401AbhCBJZm (ORCPT ); Tue, 2 Mar 2021 04:25:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378858AbhCBJDa (ORCPT ); Tue, 2 Mar 2021 04:03:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0E6AC0617AA; Tue, 2 Mar 2021 01:01:58 -0800 (PST) Date: Tue, 02 Mar 2021 09:01:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1614675716; 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=wtfTOSmNlg+RGCXYXdF48/1pcUyHTx/mrCajOMG+Mv4=; b=kFqUpJSboeIXsJsPFnV8WLdQzmA+20MrGeaXND+iTMefYYhxKSZTRW3YpGH3yZFQ+CcSHW EBqSseu6M0IOKcl+YMaVoQCghiEvw0x07lenIZ01Ei0tR+zEoWT+/Kh+1qqTac6kjqQcyp UZFWssPLMl0EZUXs1GU3OH0ZXzgPFuHA+MR4f2baVBfj5U5ui041FtA4299AGxwJgoQXZd 8LXK+8tScCfxVjQwRFKEVza/P5g0/0pNYS0CKzCk0I5RhBhMeTrb+3IWg2+8MJqzTf/opj kqqxRvOuGBdXHJ3h+Eyfo+2TYmzdtDye97WHPnCs9lSSt92Se3vjRaRLg+amsQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1614675716; 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=wtfTOSmNlg+RGCXYXdF48/1pcUyHTx/mrCajOMG+Mv4=; b=ttcLh9utv0lUvdrg9KTQPbDda80bUpp+FMEuZFeBVL10vYzvpYsz5hw4+hStw1HR+Jn58e 64zOse1+so5s8FCQ== From: "tip-bot2 for Sebastian Andrzej Siewior" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] kcov: Remove kcov include from sched.h and move it to its users. Cc: Sebastian Andrzej Siewior , "Peter Zijlstra (Intel)" , Johannes Berg , Andrey Konovalov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210218173124.iy5iyqv3a4oia4vv@linutronix.de> References: <20210218173124.iy5iyqv3a4oia4vv@linutronix.de> MIME-Version: 1.0 Message-ID: <161467571626.20312.16737329930821436697.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: eae7a59d5a1e9bcf9804bcbd006ddce5cf72f8f4 Gitweb: https://git.kernel.org/tip/eae7a59d5a1e9bcf9804bcbd006ddce5cf72f8f4 Author: Sebastian Andrzej Siewior AuthorDate: Thu, 18 Feb 2021 18:31:24 +01:00 Committer: Peter Zijlstra CommitterDate: Mon, 01 Mar 2021 18:17:22 +01:00 kcov: Remove kcov include from sched.h and move it to its users. The recent addition of in_serving_softirq() to kconv.h results in compile failure on PREEMPT_RT because it requires task_struct::softirq_disable_cnt. This is not available if kconv.h is included from sched.h. It is not needed to include kconv.h from sched.h. All but the net/ user already include the kconv header file. Move the include of the kconv.h header from sched.h it its users. Additionally include sched.h from kconv.h to ensure that everything task_struct related is available. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Peter Zijlstra (Intel) Acked-by: Johannes Berg Acked-by: Andrey Konovalov Link: https://lkml.kernel.org/r/20210218173124.iy5iyqv3a4oia4vv@linutronix.de --- include/linux/kcov.h | 1 + include/linux/sched.h | 1 - net/core/skbuff.c | 1 + net/mac80211/iface.c | 1 + net/mac80211/rx.c | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/kcov.h b/include/linux/kcov.h index 4e3037d..55dc338 100644 --- a/include/linux/kcov.h +++ b/include/linux/kcov.h @@ -2,6 +2,7 @@ #ifndef _LINUX_KCOV_H #define _LINUX_KCOV_H +#include #include struct task_struct; diff --git a/include/linux/sched.h b/include/linux/sched.h index ef00bb2..cf245bc 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 545a472..420f23c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index b80c9b0..c127deb 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include "ieee80211_i.h" diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c1343c0..62047e9 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include