diff options
Diffstat (limited to 'arch/sparc/mm/viking.S')
| -rw-r--r-- | arch/sparc/mm/viking.S | 11 | 
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index 6dfcc13d310..852257fcc82 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S @@ -14,7 +14,6 @@  #include <asm/page.h>  #include <asm/pgtsrmmu.h>  #include <asm/viking.h> -#include <asm/btfixup.h>  #ifdef CONFIG_SMP  	.data @@ -109,7 +108,7 @@ viking_mxcc_flush_page:  viking_flush_cache_page:  viking_flush_cache_range:  #ifndef CONFIG_SMP -	ld	[%o0 + 0x0], %o0		/* XXX vma->vm_mm, GROSS XXX */ +	ld	[%o0 + VMA_VM_MM], %o0  #endif  viking_flush_cache_mm:  #ifndef CONFIG_SMP @@ -149,7 +148,7 @@ viking_flush_tlb_mm:  #endif  viking_flush_tlb_range: -	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */ +	ld	[%o0 + VMA_VM_MM], %o0  	mov	SRMMU_CTX_REG, %g1  	ld	[%o0 + AOFF_mm_context], %o3  	lda	[%g1] ASI_M_MMUREGS, %g5 @@ -174,7 +173,7 @@ viking_flush_tlb_range:  #endif  viking_flush_tlb_page: -	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */ +	ld	[%o0 + VMA_VM_MM], %o0  	mov	SRMMU_CTX_REG, %g1  	ld	[%o0 + AOFF_mm_context], %o3  	lda	[%g1] ASI_M_MMUREGS, %g5 @@ -240,7 +239,7 @@ sun4dsmp_flush_tlb_range:  	tst	%g5  	bne	3f  	 mov	SRMMU_CTX_REG, %g1 -	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */ +	ld	[%o0 + VMA_VM_MM], %o0  	ld	[%o0 + AOFF_mm_context], %o3  	lda	[%g1] ASI_M_MMUREGS, %g5  	sethi	%hi(~((1 << SRMMU_PGDIR_SHIFT) - 1)), %o4 @@ -266,7 +265,7 @@ sun4dsmp_flush_tlb_page:  	tst	%g5  	bne	2f  	 mov	SRMMU_CTX_REG, %g1 -	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */ +	ld	[%o0 + VMA_VM_MM], %o0  	ld	[%o0 + AOFF_mm_context], %o3  	lda	[%g1] ASI_M_MMUREGS, %g5  	and	%o1, PAGE_MASK, %o1  | 
