Remove the tlb argument to tlb_page_demap (itlb or dtlb), in order to better

match the pmap_invalidate api.

3 files changed, 3 insertions, 13 deletions

diff --git a/sys/sparc64/include/smp.h b/sys/sparc64/include/smp.h
index 33c63ecb..b892976 100644
--- a/sys/sparc64/include/smp.h
+++ b/sys/sparc64/include/smp.h
@@ -64,7 +64,6 @@ struct ipi_cache_args {
 
 struct ipi_tlb_args {
 	u_int	ita_mask;
-	u_long	ita_tlb;
 	struct	pmap *ita_pmap;
 	u_long	ita_start;
 	u_long	ita_end;
@@ -157,7 +156,7 @@ ipi_tlb_context_demap(struct pmap *pm)
 }
 
 static __inline void *
-ipi_tlb_page_demap(u_int tlb, struct pmap *pm, vm_offset_t va)
+ipi_tlb_page_demap(struct pmap *pm, vm_offset_t va)
 {
 	struct ipi_tlb_args *ita;
 	u_int cpus;
@@ -168,7 +167,6 @@ ipi_tlb_page_demap(u_int tlb, struct pmap *pm, vm_offset_t va)
 		return (NULL);
 	ita = &ipi_tlb_args;
 	ita->ita_mask = cpus | PCPU_GET(cpumask);
-	ita->ita_tlb = tlb;
 	ita->ita_pmap = pm;
 	ita->ita_va = va;
 	cpu_ipi_selected(cpus, 0, (u_long)tl_ipi_tlb_page_demap, (u_long)ita);
@@ -229,7 +227,7 @@ ipi_tlb_context_demap(struct pmap *pm)
 }
 
 static __inline void *
-ipi_tlb_page_demap(u_int tlb, struct pmap *pm, vm_offset_t va)
+ipi_tlb_page_demap(struct pmap *pm, vm_offset_t va)
 {
 	return (NULL);
 }
diff --git a/sys/sparc64/include/tlb.h b/sys/sparc64/include/tlb.h
index 1a19ae3..65e08f2 100644
--- a/sys/sparc64/include/tlb.h
+++ b/sys/sparc64/include/tlb.h
@@ -62,9 +62,6 @@
 #define	TLB_CTX_USER_MIN		(1)
 #define	TLB_CTX_USER_MAX		(8192)
 
-#define	TLB_DTLB			(1 << 0)
-#define	TLB_ITLB			(1 << 1)
-
 #define	MMU_SFSR_ASI_SHIFT		(16)
 #define	MMU_SFSR_FT_SHIFT		(7)
 #define	MMU_SFSR_E_SHIFT		(6)
@@ -88,11 +85,8 @@ extern struct tlb_entry *kernel_tlbs;
 extern int tlb_slot_count;
 
 void	tlb_context_demap(struct pmap *pm);
-void	tlb_page_demap(u_int tlb, struct pmap *pm, vm_offset_t va);
+void	tlb_page_demap(struct pmap *pm, vm_offset_t va);
 void	tlb_range_demap(struct pmap *pm, vm_offset_t start, vm_offset_t end);
 void	tlb_dump(void);
 
-#define	tlb_tte_demap(tp, pm) \
-	tlb_page_demap(TTE_GET_TLB(tp), pm, TTE_GET_VA(tp))
-
 #endif /* !_MACHINE_TLB_H_ */
diff --git a/sys/sparc64/include/tte.h b/sys/sparc64/include/tte.h
index 22f7c10..13a445a 100644
--- a/sys/sparc64/include/tte.h
+++ b/sys/sparc64/include/tte.h
@@ -94,8 +94,6 @@
 
 #define	TTE_GET_PA(tp) \
 	((tp)->tte_data & (TD_PA_MASK << TD_PA_SHIFT))
-#define	TTE_GET_TLB(tp) \
-	(((tp)->tte_data & TD_EXEC) ? (TLB_DTLB | TLB_ITLB) : TLB_DTLB)
 #define	TTE_GET_VA(tp) \
 	((tp)->tte_vpn << PAGE_SHIFT)
 #define	TTE_GET_PMAP(tp) \