From: ira.weiny@intel.com
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Ira Weiny <ira.weiny@intel.com>,
Bjorn Helgaas <helgaas@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] x86/fixmap: Decouple KMAP_LOCAL from PCI_MMCONFIG
Date: Sat, 1 Oct 2022 17:04:15 -0700 [thread overview]
Message-ID: <20221002000415.945080-1-ira.weiny@intel.com> (raw)
From: Ira Weiny <ira.weiny@intel.com>
In commit 14df32670291 ("x86: Support kmap_local() forced debugging")
FIX_PCIE_MCFG became dependent on KMAP_LOCAL. This works because
CONFIG_KMAP_LOCAL depends on CONFIG_X86_32 which the commit changed.
config X86_32
def_bool y
depends on !64BIT
...
select KMAP_LOCAL
...
However, there is no direct relationship between the two. Adjust the
conditionals to make them independent of each other.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <helgaas@kernel.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
arch/x86/include/asm/fixmap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index d0dcefb5cc59..1c79398babf3 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -101,10 +101,10 @@ enum fixed_addresses {
#ifdef CONFIG_KMAP_LOCAL
FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_MAX_IDX * NR_CPUS) - 1,
+#endif
#ifdef CONFIG_PCI_MMCONFIG
FIX_PCIE_MCFG,
#endif
-#endif
#ifdef CONFIG_PARAVIRT_XXL
FIX_PARAVIRT_BOOTMAP,
#endif
base-commit: 274d7803837da78dfc911bcda0d593412676fc20
--
2.37.2
reply other threads:[~2022-10-02 0:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221002000415.945080-1-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).