{"id":2222216,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222216/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/87ldeuzgaq.ffs@tglx/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.1/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/"},"msgid":"<87ldeuzgaq.ffs@tglx>","date":"2026-04-10T20:55:25","name":"[V1.1,02/38] x86: Cleanup include recursion hell","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"09649839c8def6d0f797e5b09be0681fa2d07d6a","submitter":{"id":92397,"url":"http://patchwork.ozlabs.org/api/1.1/people/92397/?format=json","name":"Thomas Gleixner","email":"tglx@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/87ldeuzgaq.ffs@tglx/mbox/","series":[{"id":499507,"url":"http://patchwork.ozlabs.org/api/1.1/series/499507/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=499507","date":"2026-04-10T20:55:25","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/499507/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222216/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222216/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=uBb+aK4w;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:21b9:f100::1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-19615-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n arc=none smtp.remote-ip=\"2600:3c0a:e001:78e:0:1991:8:25\"","lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=uBb+aK4w;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org\n (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org;\n envelope-from=tglx@kernel.org; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:21b9:f100::1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1 raw public key)\n server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fspwq6lXlz1yGb\n\tfor ; Sat, 11 Apr 2026 06:55:39 +1000 (AEST)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fspwk2XKhz2yjq;\n\tSat, 11 Apr 2026 06:55:34 +1000 (AEST)","from sea.source.kernel.org (sea.source.kernel.org\n [IPv6:2600:3c0a:e001:78e:0:1991:8:25])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fspwj0hSLz2yhV\n\tfor ; Sat, 11 Apr 2026 06:55:32 +1000 (AEST)","from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n\tby sea.source.kernel.org (Postfix) with ESMTP id 6479E4031C;\n\tFri, 10 Apr 2026 20:55:29 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 25D0DC19421;\n\tFri, 10 Apr 2026 20:55:28 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1775854534;\n\tcv=none;\n b=McCEry9Z57zo73ltseJTzP/o7ANzfqFJcvTx7lQacin/eLjyoepyN7I/INGpjXsqaeYZgmZ5slthfso/UiXcUPhxSCFniH4w610pcP8zJoISw5BOD93yn7SwD3XGjMBWHuSKjTiVQoDnidlMCvOhM8jxP0MJ2AdEFGA+ZkvsLMgrLRsWZdBeaXA6wyREuKx+qvnfWl9BU7r8XzuG1rSf1R03UJ4xs+EIlwSSZZTn6cV8HC6eFSw1xzSm++dwMzvQGOxnP2gsAG+EnIZeqRY5lSvzAO0jN9hzrj077hf3qjhtUqq5Te5VgRyvOvP3J4ZBxIEInFKMKssZ5EyughmEkQ==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1775854534; c=relaxed/relaxed;\n\tbh=EaKhODvxi/ucukRjiZOPM52dL9n0W3z89ySIPcNqMX0=;\n\th=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID:\n\t MIME-Version:Content-Type;\n b=glb+5UjQ2SdP/f5xpj8QRypoaYSZtKWHkyz02/yD91k++cyOpYcyNu720YdDgzJdODpqmsw7UNOMEOpilEj5+4W5wr8KgUX9bTrtJ9NofUp9FgZ/CORT+Wrq00n7HVns7oQTMP62qkvfPqzauA1snk+6wEsNUXW+yTSAUUzygJBEFXYpPpqhS4V4oeJyWF5UHDR+s4Gb4fO4hTRjcqNpJ1aqQvAMG2qFPwqN6rzcL4EXWSJqs3H8Kch7FCt6V+E6Sy84daHFZsc695T9e0MhRDrGvB748OITkSsvVTvs2VUj153YQcg6APyvNuDlqoql3R+pOs6XMlx9yYE1FlQvww==","ARC-Authentication-Results":"i=1; lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org;\n dkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=uBb+aK4w; dkim-atps=neutral;\n spf=pass (client-ip=2600:3c0a:e001:78e:0:1991:8:25;\n helo=sea.source.kernel.org; envelope-from=tglx@kernel.org;\n receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1775854529;\n\tbh=NCLwUcavida6lTRmcWsaKb5HSspL1nWNySBxMvO4hO8=;\n\th=From:To:Cc:Subject:In-Reply-To:References:Date:From;\n\tb=uBb+aK4w3/2u4kyVJBiptzM0/JeHVU+h0LyuAGmXhRBB/wmY8nVPEGLrH6PIUauly\n\t xZ5jhTx/pd4jDAH6N0E8699fbCvDPdRPvQ/1U9PBOdvPEbxrui2vDJcfwacrKBJbAt\n\t K2KgH8S8N6W61I5bQqua5TC/HTbe1JJBDb2jmaIXqh11mio1s1ulWsCUgh1TEd2HU0\n\t +ZMxNL6Px/beH32xwdxJ9u73C9h58Vy+EiUKACVtBOcR0D3eWoYoTnffZnDWdkv8Q1\n\t Jq57olSI26FETBnKfPSYv2rHfBfCG49DcVZq8FGFKIXdb41avCYxrEXRj1YRJAzkeo\n\t CA0Wg7vMsMitA==","From":"Thomas Gleixner ","To":"LKML ","Cc":"Arnd Bergmann , x86@kernel.org, Lu Baolu\n , iommu@lists.linux.dev, Michael Grzeschik\n , netdev@vger.kernel.org,\n linux-wireless@vger.kernel.org, Herbert Xu ,\n linux-crypto@vger.kernel.org, Vlastimil Babka ,\n linux-mm@kvack.org, David Woodhouse , Bernie Thompson\n , linux-fbdev@vger.kernel.org, Theodore Tso\n , linux-ext4@vger.kernel.org, Andrew Morton\n , Uladzislau Rezki , Marco\n Elver , Dmitry Vyukov ,\n kasan-dev@googlegroups.com, Andrey Ryabinin ,\n Thomas Sailer , linux-hams@vger.kernel.org,\n \"Jason A. Donenfeld\" , Richard Henderson\n , linux-alpha@vger.kernel.org, Russell King\n , linux-arm-kernel@lists.infradead.org, Catalin\n Marinas , Huacai Chen ,\n loongarch@lists.linux.dev, Geert Uytterhoeven ,\n linux-m68k@lists.linux-m68k.org, Dinh Nguyen , Jonas\n Bonn , linux-openrisc@vger.kernel.org, Helge Deller\n , linux-parisc@vger.kernel.org, Michael Ellerman\n , linuxppc-dev@lists.ozlabs.org, Paul Walmsley\n , linux-riscv@lists.infradead.org, Heiko Carstens\n , linux-s390@vger.kernel.org, \"David S. Miller\"\n , sparclinux@vger.kernel.org","Subject":"[patch V1.1 02/38] x86: Cleanup include recursion hell","In-Reply-To":"<20260410120317.709923681@kernel.org>","References":"<20260410120044.031381086@kernel.org>\n <20260410120317.709923681@kernel.org>","Date":"Fri, 10 Apr 2026 22:55:25 +0200","Message-ID":"<87ldeuzgaq.ffs@tglx>","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"","List-Help":"","List-Owner":"","List-Post":"","List-Archive":",\n ","List-Subscribe":",\n ,\n ","List-Unsubscribe":"","Precedence":"list","MIME-Version":"1.0","Content-Type":"text/plain","X-Spam-Status":"No, score=-0.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,\n\tDKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS\n\tautolearn=disabled version=4.0.1 OzLabs 8","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org"},"content":"Including a random architecture specific header which requires global\nheaders just to avoid including that header at the two usage sites is\nreally beyond lazy and tasteless. Including global headers just to get the\n__percpu macro from linux/compiler_types.h falls into the same category.\n\nRemove the linux/percpu.h and asm/cpumask.h includes from msr.h and smp.h\nand fix the resulting fallout by a simple forward struct declaration and by\nincluding the x86 specific asm/cpumask.h header where it is actually\nrequired.\n\nSigned-off-by: Thomas Gleixner \n---\nV1.1: Fix PARAVIRT_XXL fallout....\n---\n arch/x86/include/asm/cache.h | 1 +\n arch/x86/include/asm/msr.h | 5 +++--\n arch/x86/include/asm/paravirt.h | 3 ++-\n arch/x86/include/asm/pvclock.h | 1 +\n arch/x86/include/asm/smp.h | 2 --\n arch/x86/include/asm/vdso/gettimeofday.h | 5 ++---\n arch/x86/kernel/cpu/mce/core.c | 1 +\n arch/x86/kernel/nmi.c | 1 +\n arch/x86/kernel/smpboot.c | 1 +\n 9 files changed, 12 insertions(+), 8 deletions(-)","diff":"--- a/arch/x86/include/asm/cache.h\n+++ b/arch/x86/include/asm/cache.h\n@@ -2,6 +2,7 @@\n #ifndef _ASM_X86_CACHE_H\n #define _ASM_X86_CACHE_H\n \n+#include \n #include \n \n /* L1 cache line size */\n--- a/arch/x86/include/asm/msr.h\n+++ b/arch/x86/include/asm/msr.h\n@@ -8,12 +8,11 @@\n \n #include \n #include \n-#include \n #include \n #include \n \n+#include \n #include \n-#include \n \n struct msr_info {\n \tu32\t\t\tmsr_no;\n@@ -256,6 +255,8 @@ int msr_set_bit(u32 msr, u8 bit);\n int msr_clear_bit(u32 msr, u8 bit);\n \n #ifdef CONFIG_SMP\n+struct cpumask;\n+\n int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);\n int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);\n int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);\n--- a/arch/x86/include/asm/paravirt.h\n+++ b/arch/x86/include/asm/paravirt.h\n@@ -16,9 +16,10 @@\n \n #ifndef __ASSEMBLER__\n #include \n-#include \n #include \n \n+struct cpumask;\n+\n /* The paravirtualized I/O functions */\n static inline void slow_down_io(void)\n {\n--- a/arch/x86/include/asm/pvclock.h\n+++ b/arch/x86/include/asm/pvclock.h\n@@ -2,6 +2,7 @@\n #ifndef _ASM_X86_PVCLOCK_H\n #define _ASM_X86_PVCLOCK_H\n \n+#include \n #include \n #include \n \n--- a/arch/x86/include/asm/smp.h\n+++ b/arch/x86/include/asm/smp.h\n@@ -5,8 +5,6 @@\n #include \n #include \n \n-#include \n-\n DECLARE_PER_CPU_CACHE_HOT(int, cpu_number);\n \n DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);\n--- a/arch/x86/include/asm/vdso/gettimeofday.h\n+++ b/arch/x86/include/asm/vdso/gettimeofday.h\n@@ -11,13 +11,12 @@\n #define __ASM_VDSO_GETTIMEOFDAY_H\n \n #ifndef __ASSEMBLER__\n-\n+#include \n #include \n+\n #include \n #include \n-#include \n #include \n-#include \n #include \n \n #define VDSO_HAS_TIME 1\n--- a/arch/x86/kernel/cpu/mce/core.c\n+++ b/arch/x86/kernel/cpu/mce/core.c\n@@ -48,6 +48,7 @@\n #include \n \n #include \n+#include \n #include \n #include \n #include \n--- a/arch/x86/kernel/nmi.c\n+++ b/arch/x86/kernel/nmi.c\n@@ -26,6 +26,7 @@\n #include \n #include \n \n+#include \n #include \n #include \n #include \n--- a/arch/x86/kernel/smpboot.c\n+++ b/arch/x86/kernel/smpboot.c\n@@ -70,6 +70,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n","prefixes":["V1.1","02/38"]}