* [PATCH] x86/fixmap: Decouple KMAP_LOCAL from PCI_MMCONFIG
@ 2022-10-02 0:04 ira.weiny
0 siblings, 0 replies; only message in thread
From: ira.weiny @ 2022-10-02 0:04 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Ira Weiny, Bjorn Helgaas, Dave Hansen, x86, linux-kernel
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-02 0:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-02 0:04 [PATCH] x86/fixmap: Decouple KMAP_LOCAL from PCI_MMCONFIG ira.weiny
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).