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

Commit 9a0f78f6 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: merge tlb.h 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent d3ab57eb

include/asm-ppc/tlb.h→include/asm-powerpc/tlb.h

+36 −23
Original line number Diff line number Diff line 
/*

 *	TLB shootdown specifics for PPC

 *	TLB shootdown specifics for powerpc

 *

 * Copyright (C) 2002 Anton Blanchard, IBM Corp.

 * Copyright (C) 2002 Paul Mackerras, IBM Corp.

 *

 * This program is free software; you can redistribute it and/or
@@ -8,29 +9,53 @@ 
 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#ifndef _PPC_TLB_H

#define _PPC_TLB_H

#ifndef _ASM_POWERPC_TLB_H

#define _ASM_POWERPC_TLB_H



#include <linux/config.h>

#ifndef __powerpc64__

#include <asm/pgtable.h>

#endif

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>

#ifndef __powerpc64__

#include <asm/page.h>

#include <asm/mmu.h>



#ifdef CONFIG_PPC_STD_MMU

/* Classic PPC with hash-table based MMU... */

#endif



struct mmu_gather;



#define tlb_start_vma(tlb, vma)	do { } while (0)

#define tlb_end_vma(tlb, vma)	do { } while (0)



#if !defined(CONFIG_PPC_STD_MMU)



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



#elif defined(__powerpc64__)



extern void pte_free_finish(void);



static inline void tlb_flush(struct mmu_gather *tlb)

{

	flush_tlb_pending();

	pte_free_finish();

}



#else



extern void tlb_flush(struct mmu_gather *tlb);



#endif



/* Get the generic bits... */

#include <asm-generic/tlb.h>



/* Nothing needed here in fact... */

#define tlb_start_vma(tlb, vma)	do { } while (0)

#define tlb_end_vma(tlb, vma)	do { } while (0)

#if !defined(CONFIG_PPC_STD_MMU) || defined(__powerpc64__)



#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)



#else

extern void flush_hash_entry(struct mm_struct *mm, pte_t *ptep,

			     unsigned long address);
@@ -41,17 +66,5 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, 
		flush_hash_entry(tlb->mm, ptep, address);

}



#else

/* Embedded PPC with software-loaded TLB, very simple... */



#define tlb_start_vma(tlb, vma)		do { } while (0)

#define tlb_end_vma(tlb, vma)		do { } while (0)

#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)

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



/* Get the generic bits... */

#include <asm-generic/tlb.h>



#endif /* CONFIG_PPC_STD_MMU */



#endif /* __PPC_TLB_H */
 
#endif

#endif /* __ASM_POWERPC_TLB_H */

include/asm-ppc64/tlb.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 *	TLB shootdown specifics for PPC64

 *

 * Copyright (C) 2002 Anton Blanchard, IBM Corp.

 * Copyright (C) 2002 Paul Mackerras, IBM Corp.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#ifndef _PPC64_TLB_H

#define _PPC64_TLB_H



#include <asm/tlbflush.h>



struct mmu_gather;



extern void pte_free_finish(void);



static inline void tlb_flush(struct mmu_gather *tlb)

{

	flush_tlb_pending();

	pte_free_finish();

}



/* Avoid pulling in another include just for this */

#define check_pgt_cache()	do { } while (0)



/* Get the generic bits... */

#include <asm-generic/tlb.h>



/* Nothing needed here in fact... */

#define tlb_start_vma(tlb, vma)	do { } while (0)

#define tlb_end_vma(tlb, vma)	do { } while (0)



#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)



#endif /* _PPC64_TLB_H */