Messages in this thread Patch in this message | | | From | ira.weiny@intel ... | Subject | [PATCH] x86/fixmap: Decouple KMAP_LOCAL from PCI_MMCONFIG | Date | Sat, 1 Oct 2022 17:04:15 -0700 |
| |
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
| |