Messages in this thread Patch in this message | | | From | Randy Dunlap <> | Subject | [PATCH] x86: fixmap: use CONFIG_NR_CPUS instead of NR_CPUS | Date | Fri, 21 May 2021 12:59:18 -0700 |
| |
Use CONFIG_NR_CPUS instead of NR_CPUS for an enum entry item. (Alternatively, #include <linux/threads.h> unconditionally instead of conditionally.)
This fixes 100+ build errors like so:
In file included from ../include/asm-generic/early_ioremap.h:6:0, from ./arch/x86/include/generated/asm/early_ioremap.h:1, from ../arch/x86/include/asm/io.h:44, from ../include/linux/io.h:13, from ../mm/early_ioremap.c:13: ../arch/x86/include/asm/fixmap.h:103:48: error: ‘NR_CPUS’ undeclared here (not in a function); did you mean ‘NR_OPEN’? FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_MAX_IDX * NR_CPUS) - 1,
Fixes: e972c2511967 ("mm/early_ioremap: add prototype for early_memremap_pgprot_adjust") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: x86@kernel.org Cc: Mel Gorman <mgorman@techsingularity.net> --- arch/x86/include/asm/fixmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20210521.orig/arch/x86/include/asm/fixmap.h +++ linux-next-20210521/arch/x86/include/asm/fixmap.h @@ -100,7 +100,7 @@ enum fixed_addresses { #endif #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, + FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_MAX_IDX * CONFIG_NR_CPUS) - 1, #ifdef CONFIG_PCI_MMCONFIG FIX_PCIE_MCFG, #endif
| |