powerpc/64s/radix: Fix !SMP build
Nicholas Piggin
reviewerPATCH 1/1 powerpc/64s/radix: Fix !SMP build
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 1 + arch/powerpc/mm/book3s64/radix_tlb.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
arch/powerpc/mm/book3s64/radix_pgtable.c +1 -0
@@ -26,6 +26,7 @@#include <asm/firmware.h> #include <asm/powernv.h> #include <asm/sections.h> +#include <asm/smp.h> #include <asm/trace.h> #include <asm/uaccess.h> #include <asm/ultravisor.h>
arch/powerpc/mm/book3s64/radix_tlb.c +6 -1
@@ -587,6 +587,11 @@ void radix__local_flush_all_mm(struct mm_struct *mm)preempt_enable (); }EXPORT_SYMBOL (radix__local_flush_all_mm); + +static void __flush_all_mm (struct mm_struct *mm,bool fullmm) +{ +radix__local_flush_all_mm (mm); +}#endif /* CONFIG_SMP */ void radix__local_flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmaddr,
@@ -777,7 +782,7 @@ void radix__flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr)EXPORT_SYMBOL (radix__flush_tlb_page);#else /* CONFIG_SMP */ -#define radix__flush_all_mm radix__local_flush_all_mm +static inline void exit_flush_lazy_tlbs (struct mm_struct *mm) { }#endif /* CONFIG_SMP */ static void do_tlbiel_kernel (void *info)
Signature · 1 line
2.23.0
Thanks Nick,
Quoted 1 line
Signed-off-by Nicholas Piggin <[email protected]>
Quoted 42 lines
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 1 + arch/powerpc/mm/book3s64/radix_tlb.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/arch/powerpc/mm/book3s64/radix_pgtable.cindexdd1bea45325c..2a9a0cd79490100644 ---a/arch/powerpc/mm/book3s64/radix_pgtable.c+++b/arch/powerpc/mm/book3s64/radix_pgtable.c@@ -26,6 +26,7 @@
#include <asm/firmware.h>
#include <asm/powernv.h>
#include <asm/sections.h>arch/powerpc/mm/book3s64/radix_pgtable.c +1
-0+#include <asm/smp.h> #include <asm/trace.h> #include <asm/uaccess.h> #include <asm/ultravisor.h> (quoted diff) +0
-0
b/arch/powerpc/mm/book3s64/radix_tlb.cindex03f43c924e00..758ade2c2b6e100644 ---a/arch/powerpc/mm/book3s64/radix_tlb.c+++b/arch/powerpc/mm/book3s64/radix_tlb.c@@ -587,6 +587,11 @@ voidradix__local_flush_all_mm(struct mm_struct *mm)preempt_enable();
}
EXPORT_SYMBOL(radix__local_flush_all_mm);arch/powerpc/mm/book3s64/radix_tlb.c +5
-0+ +static void __flush_all_mm (struct mm_struct *mm,bool fullmm) +{ +radix__local_flush_all_mm (mm); +}#endif /* CONFIG_SMP */ void radix__local_flush_tlb_page_psize(struct mm_struct *mm,unsigned long vmaddr, @@ -777,7 +782,7 @@ void
radix__flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr)EXPORT_SYMBOL(radix__flush_tlb_page);
#else /*CONFIG_SMP*/arch/powerpc/mm/book3s64/radix_tlb.c +1
-1-#define radix__flush_all_mm radix__local_flush_all_mm +static inline void exit_flush_lazy_tlbs (struct mm_struct *mm) { }#endif /* CONFIG_SMP */ static void do_tlbiel_kernel (void *info)
Michael Ellerman
AppliedQuoted 1 line · Nicholas Piggin
Signed-off-by Nicholas Piggin <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/993cfecc59e57de237ae27fadc84ed24efa87a4d
cheers