| Message ID | 1400093999-18703-2-git-send-email-richard@nod.at (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 14, 2014 at 07:59:33PM +0100, Richard Weinberger wrote: > --- a/arch/arm64/include/asm/tlb.h > +++ b/arch/arm64/include/asm/tlb.h > @@ -19,7 +19,14 @@ > #ifndef __ASM_TLB_H > #define __ASM_TLB_H > > +/* These defines are needed to override the defaults from asm-generic/tlb.h */ > #define __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry > +#define tlb_start_vma tlb_start_vma > +#define tlb_end_vma tlb_end_vma > +#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry > +#define tlb_flush tlb_flush > +#define __pte_free_tlb __pte_free_tlb > +#define __pmd_free_tlb __pmd_free_tlb > > #include <asm-generic/tlb.h> Acked-by: Catalin Marinas <catalin.marinas@arm.com> I hope subsequent series would consolidate some more of the above (for example tlb_start_vma() is not really arm64 specific.
Am 15.05.2014 11:34, schrieb Catalin Marinas: > On Wed, May 14, 2014 at 07:59:33PM +0100, Richard Weinberger wrote: >> --- a/arch/arm64/include/asm/tlb.h >> +++ b/arch/arm64/include/asm/tlb.h >> @@ -19,7 +19,14 @@ >> #ifndef __ASM_TLB_H >> #define __ASM_TLB_H >> >> +/* These defines are needed to override the defaults from asm-generic/tlb.h */ >> #define __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry >> +#define tlb_start_vma tlb_start_vma >> +#define tlb_end_vma tlb_end_vma >> +#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry >> +#define tlb_flush tlb_flush >> +#define __pte_free_tlb __pte_free_tlb >> +#define __pmd_free_tlb __pmd_free_tlb >> >> #include <asm-generic/tlb.h> > > Acked-by: Catalin Marinas <catalin.marinas@arm.com> > > I hope subsequent series would consolidate some more of the above (for > example tlb_start_vma() is not really arm64 specific. Yes, peterz pointed me to a not jet merged series which consolidates much more. I'll revive it. Thanks, //richard
diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h index 80e2c08..65a474d 100644 --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -19,7 +19,14 @@ #ifndef __ASM_TLB_H #define __ASM_TLB_H +/* These defines are needed to override the defaults from asm-generic/tlb.h */ #define __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry +#define tlb_start_vma tlb_start_vma +#define tlb_end_vma tlb_end_vma +#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry +#define tlb_flush tlb_flush +#define __pte_free_tlb __pte_free_tlb +#define __pmd_free_tlb __pmd_free_tlb #include <asm-generic/tlb.h>
Make sure to not conflict with the defaults provided by generic/tlb.h. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Steve Capper <steve.capper@linaro.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Richard Weinberger <richard@nod.at> Cc: Michal Hocko <mhocko@suse.cz> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Richard Weinberger <richard@nod.at> --- arch/arm64/include/asm/tlb.h | 7 +++++++ 1 file changed, 7 insertions(+)