From patchwork Tue Apr 26 20:32:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 12827948 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1EC4C433EF for ; Tue, 26 Apr 2022 20:32:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A1396B0073; Tue, 26 Apr 2022 16:32:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 128E06B0074; Tue, 26 Apr 2022 16:32:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE5C36B0075; Tue, 26 Apr 2022 16:32:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id DDA556B0073 for ; Tue, 26 Apr 2022 16:32:42 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AE354274F7 for ; Tue, 26 Apr 2022 20:32:42 +0000 (UTC) X-FDA: 79400178564.25.34BE1AD Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf20.hostedemail.com (Postfix) with ESMTP id 205651C0060 for ; Tue, 26 Apr 2022 20:32:38 +0000 (UTC) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-2f4dfd09d7fso124170737b3.0 for ; Tue, 26 Apr 2022 13:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=YHzUgr9QNc7oDN5KkGpaITjDoktFxpsf4LNMdcVtpPFSiZ1kR5IoBtXE/XY92k9t9T 95VYIubjXmyZblFdrJAhW2MMy37VNzmyvZnc9wmsakyZJmXqDi8rB6XhcUSIwzfjchJC l9sy1K1FGT2luTvexMHuPDkejArUVYZW84GEE6MZGUYEXUPCXZ7+2fW+fYlTq9uOIUkz +lhMH3UOyj5f6NiVyT3UzgorhLTiTZLfygmSlAVB0bAg8preJ3FW9MSlqCjd1v0wKbzp HMcZXuhMkofdhk3JARWAupJW2lbSJfUbparW4zu76JIS1BFdxSyQCURJF5IHCb5NORG6 Vl/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=J/e5SHUlAZUEKDflJfDlrkuQw/i9o3+XpCVrJLX8Vyn1mdRXbjRnGNtFOoqdnkGPgT PVjLu9hoy8IXdzFikR32otgnr0tyTFUR3H6mfABm5EsxWf/n6d4zhl2T00WGBcdZxO4A qlPRnj/rWh+89OLo5nEX7MKxNFz91go1PSzAn/1mSd9G8MQkPZEXLBmGMs9Lhq+Ib8Ok lyd3IUKX7tkWszr6z6tT2cSqDyzy5zj8fPf8yxFUYVTzp3zB4QAxJw6wnjcnPK0Y8QEm 4QNl4/X3nscxI/RkgbwBM6dPwM1QbVeFucIFQX9bwo6wdHD9LFVCHtqW0Ue3fULd7r04 VpPw== X-Gm-Message-State: AOAM53230TfL7wS508BcIs5Y/ldPfSJTZWFPXnfgIIHOgR6HZhy6nPb0 WQ60FzotftY1JU+yRC8H8eUSrns= X-Google-Smtp-Source: ABdhPJzh1YP7CmiwmN8+/yV7PpIBnE6Eb3WcbLq40RItiIfk+iQBhhV7y3oqof4jQQkJj88sSYXnl/Q= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:709f:5eff:336a:4109]) (user=pcc job=sendgmr) by 2002:a05:6902:52:b0:645:bd1:970e with SMTP id m18-20020a056902005200b006450bd1970emr22523227ybh.413.1651005161361; Tue, 26 Apr 2022 13:32:41 -0700 (PDT) Date: Tue, 26 Apr 2022 13:32:30 -0700 Message-Id: <20220426203231.2107365-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v4 1/2] printk: stop including cache.h from printk.h From: Peter Collingbourne To: Andrey Konovalov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrew Morton , Catalin Marinas Cc: Peter Collingbourne , Linux ARM , Linux Memory Management List , Linux Kernel Mailing List , vbabka@suse.cz, penberg@kernel.org, roman.gushchin@linux.dev, iamjoonsoo.kim@lge.com, rientjes@google.com, Herbert Xu , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev , Eric Biederman , Kees Cook Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=YHzUgr9Q; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 36VZoYgMKCFI9ww08805y.w86527EH-664Fuw4.8B0@flex--pcc.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=36VZoYgMKCFI9ww08805y.w86527EH-664Fuw4.8B0@flex--pcc.bounces.google.com X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 205651C0060 X-Rspam-User: X-Stat-Signature: k3huawggp7qys48k3mw8uej6hmgdq5gt X-HE-Tag: 1651005158-47553 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: An inclusion of cache.h in printk.h was added in 2014 in commit c28aa1f0a847 ("printk/cache: mark printk_once test variable __read_mostly") in order to bring in the definition of __read_mostly. The usage of __read_mostly was later removed in commit 3ec25826ae33 ("printk: Tie printk_once / printk_deferred_once into .data.once for reset") which made the inclusion of cache.h unnecessary, so remove it. We have a small amount of code that depended on the inclusion of cache.h from printk.h; fix that code to include the appropriate header. This fixes a circular inclusion on arm64 (linux/printk.h -> linux/cache.h -> asm/cache.h -> linux/kasan-enabled.h -> linux/static_key.h -> linux/jump_label.h -> linux/bug.h -> asm/bug.h -> linux/printk.h) that would otherwise be introduced by the next patch. Build tested using {allyesconfig,defconfig} x {arm64,x86_64}. Link: https://linux-review.googlesource.com/id/I8fd51f72c9ef1f2d6afd3b2cbc875aa4792c1fba Signed-off-by: Peter Collingbourne Reported-by: kernel test robot Reported-by: kernel test robot --- arch/arm64/include/asm/mte-kasan.h | 1 + arch/arm64/include/asm/percpu.h | 1 + drivers/firmware/smccc/kvm_guest.c | 1 + include/linux/printk.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h index a857bcacf0fe..9f79425fc65a 100644 --- a/arch/arm64/include/asm/mte-kasan.h +++ b/arch/arm64/include/asm/mte-kasan.h @@ -6,6 +6,7 @@ #define __ASM_MTE_KASAN_H #include +#include #include #ifndef __ASSEMBLY__ diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h index 8f1661603b78..b9ba19dbdb69 100644 --- a/arch/arm64/include/asm/percpu.h +++ b/arch/arm64/include/asm/percpu.h @@ -10,6 +10,7 @@ #include #include #include +#include static inline void set_my_cpu_offset(unsigned long off) { diff --git a/drivers/firmware/smccc/kvm_guest.c b/drivers/firmware/smccc/kvm_guest.c index 2d3e866decaa..89a68e7eeaa6 100644 --- a/drivers/firmware/smccc/kvm_guest.c +++ b/drivers/firmware/smccc/kvm_guest.c @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/include/linux/printk.h b/include/linux/printk.h index 1522df223c0f..8e8d74edf121 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include