From: Paul Mackerras <paulus@ozlabs.org>
To: linuxppc-dev@ozlabs.org, Benjamin Herrenschmidt <benh@ozlabs.org>,
Michael Neuling <mikey@neuling.org>,
Anton Blanchard <anton@ozlabs.org>
Subject: [PATCH RFC 1/4] powerpc/radix: Fix compilation for radix with CONFIG_SMP=n
Date: Sat, 9 May 2020 15:02:04 +1000 [thread overview]
Message-ID: <20200509050204.GB1464954@thinks.paulus.ozlabs.org> (raw)
In-Reply-To: <20200509050103.GA1464954@thinks.paulus.ozlabs.org>
This fixes the compile errors we currently get with CONFIG_SMP=n and
CONFIG_PPC_RADIX_MMU=y.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---
arch/powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 ++
arch/powerpc/mm/book3s64/radix_tlb.c | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h b/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
index ca8db193ae38..adcc6114d170 100644
--- a/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
+++ b/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
@@ -68,6 +68,8 @@ extern void radix__flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmad
#define radix__flush_all_mm(mm) radix__local_flush_all_mm(mm)
#define radix__flush_tlb_page(vma,addr) radix__local_flush_tlb_page(vma,addr)
#define radix__flush_tlb_page_psize(mm,addr,p) radix__local_flush_tlb_page_psize(mm,addr,p)
+#define exit_flush_lazy_tlbs(mm) do { } while (0)
+#define __flush_all_mm(mm, fullmm) radix__local_flush_all_mm(mm)
#endif
extern void radix__flush_tlb_pwc(struct mmu_gather *tlb, unsigned long addr);
extern void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr);
diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c
index 03f43c924e00..e3ea026cf91e 100644
--- a/arch/powerpc/mm/book3s64/radix_tlb.c
+++ b/arch/powerpc/mm/book3s64/radix_tlb.c
@@ -776,8 +776,6 @@ 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
#endif /* CONFIG_SMP */
static void do_tlbiel_kernel(void *info)
--
2.25.3
next prev parent reply other threads:[~2020-05-09 5:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 5:01 [PATCH RFC 0/4] Add support for Microwatt-based SoCs Paul Mackerras
2020-05-09 5:02 ` Paul Mackerras [this message]
2020-05-09 7:52 ` [PATCH RFC 1/4] powerpc/radix: Fix compilation for radix with CONFIG_SMP=n Nicholas Piggin
2020-05-14 8:26 ` Joel Stanley
2020-05-09 5:02 ` [PATCH RFC 2/4] powerpc: Add Microwatt platform Paul Mackerras
2020-05-09 7:58 ` Nicholas Piggin
2020-05-09 8:36 ` Alistair Popple
2020-05-09 9:10 ` Nicholas Piggin
2020-05-12 1:56 ` Michael Ellerman
2020-05-09 5:03 ` [PATCH RFC 3/4] powerpc/microwatt: Add early debug UART support for Microwatt Paul Mackerras
2020-05-11 7:07 ` Segher Boessenkool
2020-05-12 1:57 ` Michael Ellerman
2020-05-09 5:04 ` [PATCH RFC 4/4] powerpc/radix: Add support for microwatt's PRTBL SPR Paul Mackerras
2020-05-09 8:02 ` Nicholas Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200509050204.GB1464954@thinks.paulus.ozlabs.org \
--to=paulus@ozlabs.org \
--cc=anton@ozlabs.org \
--cc=benh@ozlabs.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=mikey@neuling.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.