powerpc/64s: Fix build failure when CONFIG_PPC_64S_HASH_MMU is not set
PATCH v2 1/1 powerpc/64s: Fix build failure when CONFIG_PPC_64S_HASH_MMU is not set
The following build failure occurs when CONFIG_PPC_64S_HASH_MMU is not set:
arch/powerpc/kernel/setup_64.c: In function ‘setup_per_cpu_areas’:
arch/powerpc/kernel/setup_64.c:811:21: error: ‘mmu_linear_psize’ undeclared (first use in this function); did you mean ‘mmu_virtual_psize’?
811 | if (mmu_linear_psize == MMU_PAGE_4K)
| ^~~~~~~~~~~~~~~~
| mmu_virtual_psize
arch/powerpc/kernel/setup_64.c:811:21: note: each undeclared identifier is reported only once for each function it appears in
Move the declaration of mmu_linear_psize outside of CONFIG_PPC_64S_HASH_MMU ifdef.
After the above is fixed, it fails later with the following error:
ld: arch/powerpc/kexec/file_load_64.o: in function `.arch_kexec_kernel_image_probe':
file_load_64.c:(.text+0x1c1c): undefined reference to `.add_htab_mem_range'
Fix that, too, by conditioning add_htab_mem_range() symbol to CONFIG_PPC_64S_HASH_MMU.
---
v1: https://lore.kernel.org/linuxppc-dev/[email protected]/
arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- arch/powerpc/include/asm/kexec_ranges.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/book3s/64/mmu.h +1 -1
@@ -202,7 +202,6 @@ static inline struct subpage_prot_table *mm_ctx_subpage_prot(mm_context_t *ctx)/* * The current system page and segment sizes */ -extern int mmu_linear_psize;extern int mmu_virtual_psize;extern int mmu_vmalloc_psize;extern int mmu_io_psize;
@@ -213,6 +212,7 @@ extern int mmu_io_psize;#define mmu_virtual_psize MMU_PAGE_4K#endif #endif +extern int mmu_linear_psize;extern int mmu_vmemmap_psize;/* MMU initialization */
arch/powerpc/include/asm/kexec_ranges.h +1 -1
@@ -9,7 +9,7 @@ struct crash_mem *realloc_mem_ranges(struct crash_mem **mem_ranges);int add_mem_range (struct crash_mem **mem_ranges,u64 base,u64 size);int add_tce_mem_ranges (struct crash_mem **mem_ranges);int add_initrd_mem_range (struct crash_mem **mem_ranges); -#ifdef CONFIG_PPC_BOOK3S_64 +#ifdef CONFIG_PPC_64S_HASH_MMU int add_htab_mem_range (struct crash_mem **mem_ranges);#else static inline int add_htab_mem_range (struct crash_mem **mem_ranges)
Signature · 1 line
2.35.1
Michael Ellerman
AppliedQuoted 11 lines · Murilo Opsfelder Araujo
The following build failure occurs when
CONFIG_PPC_64S_HASH_MMUis not set:
arch/powerpc/kernel/setup_64.c: In function ‘setup_per_cpu_areas’:
arch/powerpc/kernel/setup_64.c:811:21: error: ‘mmu_linear_psize’ undeclared (first use in this function); did you mean ‘mmu_virtual_psize’?
811 | if (mmu_linear_psize==MMU_PAGE_4K)
| ^~~~~~~~~~~~~~~~
|mmu_virtual_psize
arch/powerpc/kernel/setup_64.c:811:21: note: each undeclared identifier is reported only once for each function it appears in[...]
Applied to powerpc/fixes.
[1/1] powerpc/64s: Fix build failure when CONFIG_PPC_64S_HASH_MMU is not set
https://git.kernel.org/powerpc/c/58dbe9b373df2828d873b1c0e5afc77485b2f376
cheers