Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c01905ee authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: mm: Move UNIQUE_ENTRYHI macro to a header file 



The UNIQUE_ENTRYHI definition was duplicated whenever there
was the need to flush the TLB entries. We move this common
definition to a header file.

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6129/
parent 691038ba

arch/mips/include/asm/tlb.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ 
 */

 */

#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)

#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)





#define UNIQUE_ENTRYHI(idx)	(CKSEG0 + ((idx) << (PAGE_SHIFT + 1)))



#include <asm-generic/tlb.h>

#include <asm-generic/tlb.h>





#endif /* __ASM_TLB_H */
 
#endif /* __ASM_TLB_H */

arch/mips/mm/init.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -171,8 +171,6 @@ void *kmap_coherent(struct page *page, unsigned long addr) 
	return (void*) vaddr;

	return (void*) vaddr;

}

}





#define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1)))



void kunmap_coherent(void)

void kunmap_coherent(void)

{

{

#ifndef CONFIG_MIPS_MT_SMTC

#ifndef CONFIG_MIPS_MT_SMTC

arch/mips/mm/tlb-r4k.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -20,16 +20,11 @@ 
#include <asm/bootinfo.h>

#include <asm/bootinfo.h>

#include <asm/mmu_context.h>

#include <asm/mmu_context.h>

#include <asm/pgtable.h>

#include <asm/pgtable.h>

#include <asm/tlb.h>

#include <asm/tlbmisc.h>

#include <asm/tlbmisc.h>





extern void build_tlb_refill_handler(void);

extern void build_tlb_refill_handler(void);





/*

 * Make sure all entries differ.  If they're not different

 * MIPS32 will take revenge ...

 */

#define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1)))



/* Atomicity and interruptability */

/* Atomicity and interruptability */

#ifdef CONFIG_MIPS_MT_SMTC

#ifdef CONFIG_MIPS_MT_SMTC