X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fparisc%2Fkernel%2Fpacache.S;h=9534ee17b9bec789b77bb9da7a089e9ef11bfa1f;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=f600556414d1a3afb0e7ae5d96f95832e3da5e1a;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index f60055641..9534ee17b 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -65,7 +65,7 @@ flush_tlb_all_local:
 	 */
 
 	/* pcxt_ssm_bug	- relied upon translation! PA 2.0 Arch. F-4 and F-5 */
-	rsm		PSW_SM_I, %r19		/* save I-bit state */
+	rsm	PSW_SM_I, %r19		/* save I-bit state */
 	load32		PA(1f), %r1
 	nop
 	nop
@@ -84,7 +84,8 @@ flush_tlb_all_local:
 	rfi
 	nop
 
-1:      load32		PA(cache_info), %r1
+1:      ldil		L%PA(cache_info), %r1
+	ldo		R%PA(cache_info)(%r1), %r1
 
 	/* Flush Instruction Tlb */
 
@@ -211,7 +212,8 @@ flush_instruction_cache_local:
 	.entry
 
 	mtsp		%r0, %sr1
-	load32		cache_info, %r1
+	ldil		L%cache_info, %r1
+	ldo		R%cache_info(%r1), %r1
 
 	/* Flush Instruction Cache */
 
@@ -252,7 +254,8 @@ flush_data_cache_local:
 	.entry
 
 	mtsp		%r0, %sr1
-	load32 		cache_info, %r1
+	ldil		L%cache_info, %r1
+	ldo		R%cache_info(%r1), %r1
 
 	/* Flush Data Cache */
 
@@ -300,8 +303,7 @@ copy_user_page_asm:
 	 */
 
 	ldd		0(%r25), %r19
-	ldi		ASM_PAGE_SIZE_DIV128, %r1
-
+	ldi		32, %r1                 /* PAGE_SIZE/128 == 32 */
 	ldw		64(%r25), %r0		/* prefetch 1 cacheline ahead */
 	ldw		128(%r25), %r0		/* prefetch 2 */
 
@@ -366,7 +368,7 @@ copy_user_page_asm:
 	 * use ldd/std on a 32 bit kernel.
 	 */
 	ldw		0(%r25), %r19
-	ldi		ASM_PAGE_SIZE_DIV64, %r1
+	ldi		64, %r1		/* PAGE_SIZE/64 == 64 */
 
 1:
 	ldw		4(%r25), %r20
@@ -459,7 +461,6 @@ copy_user_page_asm:
 	sub		%r25, %r1, %r23		/* move physical addr into non shadowed reg */
 
 	ldil		L%(TMPALIAS_MAP_START), %r28
-	/* FIXME for different page sizes != 4k */
 #ifdef CONFIG_64BIT
 	extrd,u		%r26,56,32, %r26		/* convert phys addr to tlb insert format */
 	extrd,u		%r23,56,32, %r23		/* convert phys addr to tlb insert format */
@@ -550,7 +551,6 @@ __clear_user_page_asm:
 #ifdef CONFIG_64BIT
 #if (TMPALIAS_MAP_START >= 0x80000000)
 	depdi		0, 31,32, %r28		/* clear any sign extension */
-	/* FIXME: page size dependend */
 #endif
 	extrd,u		%r26, 56,32, %r26	/* convert phys addr to tlb insert format */
 	depd		%r25, 63,22, %r28	/* Form aliased virtual address 'to' */
@@ -566,10 +566,10 @@ __clear_user_page_asm:
 	pdtlb		0(%r28)
 
 #ifdef CONFIG_64BIT
-	ldi		ASM_PAGE_SIZE_DIV128, %r1
+	ldi		32, %r1			/* PAGE_SIZE/128 == 32 */
 
 	/* PREFETCH (Write) has not (yet) been proven to help here */
-	/* #define	PREFETCHW_OP	ldd		256(%0), %r0 */
+/* #define	PREFETCHW_OP	ldd		256(%0), %r0 */
 
 1:	std		%r0, 0(%r28)
 	std		%r0, 8(%r28)
@@ -591,7 +591,8 @@ __clear_user_page_asm:
 	ldo		128(%r28), %r28
 
 #else	/* ! CONFIG_64BIT */
-	ldi		ASM_PAGE_SIZE_DIV64, %r1
+
+	ldi		64, %r1			/* PAGE_SIZE/64 == 64 */
 
 1:
 	stw		%r0, 0(%r28)
@@ -620,9 +621,9 @@ __clear_user_page_asm:
 
 	.procend
 
-	.export flush_kernel_dcache_page_asm
+	.export flush_kernel_dcache_page
 
-flush_kernel_dcache_page_asm:
+flush_kernel_dcache_page:
 	.proc
 	.callinfo NO_CALLS
 	.entry