From patchwork Thu Feb 18 17:31:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Sewior X-Patchwork-Id: 12093835 X-Patchwork-Delegate: kuba@kernel.org 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=-15.8 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,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 3DF4DC433DB for ; Thu, 18 Feb 2021 17:52:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0016F64EAF for ; Thu, 18 Feb 2021 17:52:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234648AbhBRRvo (ORCPT ); Thu, 18 Feb 2021 12:51:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234356AbhBRRcJ (ORCPT ); Thu, 18 Feb 2021 12:32:09 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ECD3C061574; Thu, 18 Feb 2021 09:31:28 -0800 (PST) Date: Thu, 18 Feb 2021 18:31:24 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1613669486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=nLRBuVVWvc8V3uVW45ibYaABYhWDXpjkZ5kiNjBTKQk=; b=vE8Bl+8aDfr6BdcXD0gj7H/o1sA/w1cOYT0V+8JyW4JtxHErc89pA+Pz0Fk6Wf0PtuEPZF OUbk5JZ6Tnj37TmhRYe8+9ByHXaU9ipZ/aj6qtaNVVRecTQphXzP4a/keZkPzQW2XO5sSs KiFpcT/P/Ag/ZCUWYMYMVgVBdU905FgHIJjhWq18dUwExx0sFUYdWLo0tfTozIU334n+28 t7td9yWBl4tSAT0EGD13Oim8HReFtrayyovUbnsPi2/LT84olfqqwJspTMIFO6cIVtpxB/ hJHmWgoM++Xo9UATugjrVZAkctW3NGxsOruzmk/lWaLP6xULT1oOEMVMM0+JPQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1613669486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=nLRBuVVWvc8V3uVW45ibYaABYhWDXpjkZ5kiNjBTKQk=; b=r5bBoiddMeojU/BxwZp5Q3JGx4e4u1hPZNUoeV1fuLyrO/Kd20S7+FDo7vfYfc8V9op81O jV+zSj0NPzBS8fDg== From: Sebastian Andrzej Siewior To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Cc: Dmitry Vyukov , Andrey Konovalov , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Thomas Gleixner , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , "David S. Miller" , Jakub Kicinski , Johannes Berg , netdev@vger.kernel.org Subject: [PATCH] kcov: Remove kcov include from sched.h and move it to its users. Message-ID: <20210218173124.iy5iyqv3a4oia4vv@linutronix.de> MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Acked-by: Johannes Berg Acked-by: Andrey Konovalov --- 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 4e3037dc12048..55dc338f6bcdd 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 7337630326751..183e9d90841cb 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 785daff48030d..e64d0a2e21c31 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 b31417f40bd56..39943c33abbfa 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 972895e9f22dc..3527b17f235a8 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include