Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'powerpc-5.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman:
"Fix build failure when CONFIG_PPC_64S_HASH_MMU is not set.
Thanks to Murilo Opsfelder Araujo, and Erhard F"
* tag 'powerpc-5.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/64s: Fix build failure when CONFIG_PPC_64S_HASH_MMU is not set
+2
-2
+1
-1
arch/powerpc/include/asm/book3s/64/mmu.h
+1
-1
arch/powerpc/include/asm/book3s/64/mmu.h
···
202
202
/*
203
203
* The current system page and segment sizes
204
204
*/
205
-
extern int mmu_linear_psize;
206
205
extern int mmu_virtual_psize;
207
206
extern int mmu_vmalloc_psize;
208
207
extern int mmu_io_psize;
···
212
213
#define mmu_virtual_psize MMU_PAGE_4K
213
214
#endif
214
215
#endif
216
+
extern int mmu_linear_psize;
215
217
extern int mmu_vmemmap_psize;
216
218
217
219
/* MMU initialization */
+1
-1
arch/powerpc/include/asm/kexec_ranges.h
+1
-1
arch/powerpc/include/asm/kexec_ranges.h
···
9
9
int add_mem_range(struct crash_mem **mem_ranges, u64 base, u64 size);
10
10
int add_tce_mem_ranges(struct crash_mem **mem_ranges);
11
11
int add_initrd_mem_range(struct crash_mem **mem_ranges);
12
-
#ifdef CONFIG_PPC_BOOK3S_64
12
+
#ifdef CONFIG_PPC_64S_HASH_MMU
13
13
int add_htab_mem_range(struct crash_mem **mem_ranges);
14
14
#else
15
15
static inline int add_htab_mem_range(struct crash_mem **mem_ranges)