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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D03CCDE009 for ; Thu, 25 Jun 2026 10:43:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:Subject:Cc:To:From:Date:Message-ID:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: List-Owner; bh=vrE5rKKh67A7ttm5RQO/CXJ/rkAgZefEmuAWd7/EtXk=; b=wRQhX/A5B30Jgg U0Uc25GtqNoiIC3zjkaGqZ9YSYJ6xSAPc+nT/Act2qhbOU3jSPr91EwQZIpmrDXQg3QCqCO1L7y3O EVcJ9E/bBClMctd+KWpd9xnJcdzhlOOCov/etUfDKsRo/jI15s3PNSTaTL6mejdhbuuW+nn+SwVHx ZxWXENQbLr1zScuD81L7T7qSTh9EAPf4VfjWLXwSruPRAjbdkXYtm3/SdmBxDli14s+LquCsNVyNN O42UEcX1wvJIZV0luFYZ4j5GvYV8eJ3Hp7Ry6702wZkJW+SCdZzHMHFgFvDNmgJJIrXLqGvrdwlUi O34Y2t5AxrEpM3SeHf8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wchYV-000000090Px-2cyO; Thu, 25 Jun 2026 10:43:35 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wchYV-000000090PZ-0R6n for linux-arm-kernel@lists.infradead.org; Thu, 25 Jun 2026 10:43:35 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id A83AC40146; Thu, 25 Jun 2026 10:43:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DC901F00A3D; Thu, 25 Jun 2026 10:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782384214; bh=vrE5rKKh67A7ttm5RQO/CXJ/rkAgZefEmuAWd7/EtXk=; h=Date:From:To:Cc:Subject:References; b=jCZlirZKjW2TUHy8idztUHCy4JIRd6I6M7e6xGNB23f3pyXf16FhvqG35DrXbTKif 6CTdD9I7QCaqiGxZugzO7MmTStmCmJRqZyKjOD2zH6ykU5hvcdCFabi3O+xbQjzlCp HXOV6f0o71MzIypBKKi3RKSTW3TUdHlVKxejROkvPBTKmZw7W5JJBpN3I1t676Izr5 ZLxEfDC34+BMHYGfUs9Ki7IhnhcW12qrIXm4Qsr39vpPQ2RXr+gXQmH1XwzEN3U17w PscFL1YbbVfy1enFaH7zV/kWilNH4t2W73evYLf6fhTFgl6kXpKsrHnxlGp7wQY30g TswFZtxoRGi/g== Received: from rostedt by gandalf with local (Exim 4.99.3) (envelope-from ) id 1wchYw-00000002WAe-1TEX; Thu, 25 Jun 2026 06:44:02 -0400 Message-ID: <20260625104402.210473477@kernel.org> User-Agent: quilt/0.69 Date: Thu, 25 Jun 2026 06:40:09 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Linus Torvalds , Sebastian Andrzej Siewior , John Ogness , Thomas Gleixner , Peter Zijlstra , Julia Lawall , Yury Norov , linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, dri-devel@lists.freedesktop.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-rdma@vger.kernel.org, linux-usb@vger.kernel.org, linux-ext4@vger.kernel.org, linux-nfs@vger.kernel.org, kvm@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: [PATCH v4 2/2] tracing: Remove trace_printk.h from kernel.h References: <20260625104007.041432666@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Steven Rostedt There have been complaints about trace_printk.h causing more build time for being in kernel.h if it changes. There is also an effort to clean up kernel.h to have it not include unneeded header files. Move trace_printk.h out of kernel.h and place it in the headers and C files that use it. Link: https://lore.kernel.org/all/CAHk-=wikCBeVFjVXiY4o-oepdbjAoir5+TcAgtL12c4u1TpZLQ@mail.gmail.com/ Suggested-by: Yury Norov Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt --- arch/powerpc/kvm/book3s_xics.c | 1 + drivers/gpu/drm/i915/gt/intel_gtt.h | 1 + drivers/gpu/drm/i915/i915_gem.h | 1 + drivers/hwtracing/stm/dummy_stm.c | 1 + drivers/infiniband/hw/hfi1/trace_dbg.h | 1 + drivers/usb/early/xhci-dbc.c | 1 + fs/ext4/inline.c | 1 + include/linux/ftrace.h | 2 ++ include/linux/kernel.h | 1 - include/linux/sunrpc/debug.h | 1 + include/linux/trace_printk.h | 5 +++-- kernel/trace/ring_buffer_benchmark.c | 1 + samples/fprobe/fprobe_example.c | 1 + samples/ftrace/ftrace-direct-too.c | 1 - samples/trace_printk/trace-printk.c | 1 + 15 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c index 74a44fa702b0..ef5eb596a56e 100644 --- a/arch/powerpc/kvm/book3s_xics.c +++ b/arch/powerpc/kvm/book3s_xics.c @@ -26,6 +26,7 @@ #if 1 #define XICS_DBG(fmt...) do { } while (0) #else +#include #define XICS_DBG(fmt...) trace_printk(fmt) #endif diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.h b/drivers/gpu/drm/i915/gt/intel_gtt.h index b54ee4f25af1..f6f223090760 100644 --- a/drivers/gpu/drm/i915/gt/intel_gtt.h +++ b/drivers/gpu/drm/i915/gt/intel_gtt.h @@ -35,6 +35,7 @@ #define I915_GFP_ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN) #if IS_ENABLED(CONFIG_DRM_I915_TRACE_GTT) +#include #define GTT_TRACE(...) trace_printk(__VA_ARGS__) #else #define GTT_TRACE(...) diff --git a/drivers/gpu/drm/i915/i915_gem.h b/drivers/gpu/drm/i915/i915_gem.h index 1da8fb61c09e..f490052e8964 100644 --- a/drivers/gpu/drm/i915/i915_gem.h +++ b/drivers/gpu/drm/i915/i915_gem.h @@ -117,6 +117,7 @@ int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file); #if IS_ENABLED(CONFIG_DRM_I915_TRACE_GEM) #include +#include #define GEM_TRACE(...) trace_printk(__VA_ARGS__) #define GEM_TRACE_ERR(...) do { \ pr_err(__VA_ARGS__); \ diff --git a/drivers/hwtracing/stm/dummy_stm.c b/drivers/hwtracing/stm/dummy_stm.c index 38528ffdc0b3..7c5e48ebfb9f 100644 --- a/drivers/hwtracing/stm/dummy_stm.c +++ b/drivers/hwtracing/stm/dummy_stm.c @@ -8,6 +8,7 @@ */ #undef DEBUG +#include #include #include #include diff --git a/drivers/infiniband/hw/hfi1/trace_dbg.h b/drivers/infiniband/hw/hfi1/trace_dbg.h index 58304b91380f..30df5e246586 100644 --- a/drivers/infiniband/hw/hfi1/trace_dbg.h +++ b/drivers/infiniband/hw/hfi1/trace_dbg.h @@ -103,6 +103,7 @@ __hfi1_trace_def(IOCTL); */ #ifdef HFI1_EARLY_DBG +#include #define hfi1_dbg_early(fmt, ...) \ trace_printk(fmt, ##__VA_ARGS__) #else diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index 41118bba9197..955c73bd601f 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c @@ -30,6 +30,7 @@ static struct xdbc_state xdbc; static bool early_console_keep; #ifdef XDBC_TRACE +#include #define xdbc_trace trace_printk #else static inline void xdbc_trace(const char *fmt, ...) { } diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 8045e4ff270c..0eff4a0c6a6c 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -934,6 +934,7 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping, } #ifdef INLINE_DIR_DEBUG +#include void ext4_show_inline_dir(struct inode *dir, struct buffer_head *bh, void *inline_start, int inline_size) { diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 02bc5027523a..b5336a81e619 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -8,6 +8,8 @@ #define _LINUX_FTRACE_H #include +#include +#include #include #include #include diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e5570a16cbb1..e87a40fbd152 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -31,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index ab61bed2f7af..7524f5d82fba 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h @@ -29,6 +29,7 @@ extern unsigned int nlm_debug; # define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac)) # if IS_ENABLED(CONFIG_SUNRPC_DEBUG_TRACE) +# include # define __sunrpc_printk(fmt, ...) trace_printk(fmt, ##__VA_ARGS__) # else # define __sunrpc_printk(fmt, ...) printk(KERN_DEFAULT fmt, ##__VA_ARGS__) diff --git a/include/linux/trace_printk.h b/include/linux/trace_printk.h index a488ea9e9f85..74ce4f8995c4 100644 --- a/include/linux/trace_printk.h +++ b/include/linux/trace_printk.h @@ -1,11 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_TRACE_PRINTK_H #define _LINUX_TRACE_PRINTK_H +#if !defined(__ASSEMBLY__) && !defined(__GENKSYMS__) && !defined(BUILD_VDSO) -#include #include #include #include +#include #ifdef CONFIG_TRACING static inline __printf(1, 2) @@ -147,5 +148,5 @@ ftrace_vprintk(const char *fmt, va_list ap) return 0; } #endif /* CONFIG_TRACING */ - +#endif /* !defined(__ASSEMBLY__) && !defined(__GENKSYMS__) && !defined(BUILD_VDSO) */ #endif diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c index 593e3b59e42e..2bb25caebb75 100644 --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c @@ -5,6 +5,7 @@ * Copyright (C) 2009 Steven Rostedt */ #include +#include #include #include #include diff --git a/samples/fprobe/fprobe_example.c b/samples/fprobe/fprobe_example.c index bfe98ce826f3..de81b9b4ca7d 100644 --- a/samples/fprobe/fprobe_example.c +++ b/samples/fprobe/fprobe_example.c @@ -12,6 +12,7 @@ #define pr_fmt(fmt) "%s: " fmt, __func__ +#include #include #include #include diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c index bf2411aa6fd7..159190f4103f 100644 --- a/samples/ftrace/ftrace-direct-too.c +++ b/samples/ftrace/ftrace-direct-too.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only #include - #include /* for handle_mm_fault() */ #include #if !defined(CONFIG_ARM64) && !defined(CONFIG_PPC32) diff --git a/samples/trace_printk/trace-printk.c b/samples/trace_printk/trace-printk.c index cfc159580263..ff37aeb8523e 100644 --- a/samples/trace_printk/trace-printk.c +++ b/samples/trace_printk/trace-printk.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only +#include #include #include #include -- 2.53.0