| Message ID | 20231130114433.3053544-1-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d8c3f243d4db24675b653f0568bb65dae34e6455 |
| Headers | show |
| Series | [1/2] powerpc/mm: Fix build failures due to arch_reserved_kernel_pages() | expand |
On Thu, 30 Nov 2023 22:44:32 +1100, Michael Ellerman wrote: > With NUMA=n and FA_DUMP=y or PRESERVE_FA_DUMP=y the build fails with: > > arch/powerpc/kernel/fadump.c:1739:22: error: no previous prototype for ‘arch_reserved_kernel_pages’ [-Werror=missing-prototypes] > 1739 | unsigned long __init arch_reserved_kernel_pages(void) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > The prototype for arch_reserved_kernel_pages() is in include/linux/mm.h, > but it's guarded by __HAVE_ARCH_RESERVED_KERNEL_PAGES. The powerpc > headers define __HAVE_ARCH_RESERVED_KERNEL_PAGES in asm/mmzone.h, which > is not included into the generic headers when NUMA=n. > > [...] Applied to powerpc/next. [1/2] powerpc/mm: Fix build failures due to arch_reserved_kernel_pages() https://git.kernel.org/powerpc/c/d8c3f243d4db24675b653f0568bb65dae34e6455 [2/2] powerpc: Fix build error due to is_valid_bugaddr() https://git.kernel.org/powerpc/c/f8d3555355653848082c351fa90775214fb8a4fa cheers
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 52cc25864a1b..d8b7e246a32f 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -412,5 +412,9 @@ extern void *abatron_pteptrs[2]; #include <asm/nohash/mmu.h> #endif +#if defined(CONFIG_FA_DUMP) || defined(CONFIG_PRESERVE_FA_DUMP) +#define __HAVE_ARCH_RESERVED_KERNEL_PAGES +#endif + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_MMU_H_ */ diff --git a/arch/powerpc/include/asm/mmzone.h b/arch/powerpc/include/asm/mmzone.h index 4740ca230d36..da827d2d0866 100644 --- a/arch/powerpc/include/asm/mmzone.h +++ b/arch/powerpc/include/asm/mmzone.h @@ -42,9 +42,6 @@ u64 memory_hotplug_max(void); #else #define memory_hotplug_max() memblock_end_of_DRAM() #endif /* CONFIG_NUMA */ -#ifdef CONFIG_FA_DUMP -#define __HAVE_ARCH_RESERVED_KERNEL_PAGES -#endif #endif /* __KERNEL__ */ #endif /* _ASM_MMZONE_H_ */
With NUMA=n and FA_DUMP=y or PRESERVE_FA_DUMP=y the build fails with: arch/powerpc/kernel/fadump.c:1739:22: error: no previous prototype for ‘arch_reserved_kernel_pages’ [-Werror=missing-prototypes] 1739 | unsigned long __init arch_reserved_kernel_pages(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ The prototype for arch_reserved_kernel_pages() is in include/linux/mm.h, but it's guarded by __HAVE_ARCH_RESERVED_KERNEL_PAGES. The powerpc headers define __HAVE_ARCH_RESERVED_KERNEL_PAGES in asm/mmzone.h, which is not included into the generic headers when NUMA=n. Move the definition of __HAVE_ARCH_RESERVED_KERNEL_PAGES into asm/mmu.h which is included regardless of NUMA=n. Additionally the ifdef around __HAVE_ARCH_RESERVED_KERNEL_PAGES needs to also check for CONFIG_PRESERVE_FA_DUMP. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/include/asm/mmu.h | 4 ++++ arch/powerpc/include/asm/mmzone.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-)