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

Commit 6ebeafff authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

[PARISC] Clean up pointless ASM_PAGE_SIZE_DIV use 



Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 80af0876

arch/parisc/kernel/asm-offsets.c

+0 −2
Original line number Diff line number Diff line
@@ -290,8 +290,6 @@ int main(void) 
	DEFINE(ASM_PTE_ENTRY_SIZE, PTE_ENTRY_SIZE);

	DEFINE(ASM_PFN_PTE_SHIFT, PFN_PTE_SHIFT);

	DEFINE(ASM_PT_INITIAL, PT_INITIAL);

	DEFINE(ASM_PAGE_SIZE_DIV64, PAGE_SIZE/64);

	DEFINE(ASM_PAGE_SIZE_DIV128, PAGE_SIZE/128);

	BLANK();

	DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));

	DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));

arch/parisc/kernel/pacache.S

+4 −4
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ ENTRY(copy_user_page_asm) 
	 */



	ldd		0(%r25), %r19

	ldi		ASM_PAGE_SIZE_DIV128, %r1

	ldi		(PAGE_SIZE / 128), %r1



	ldw		64(%r25), %r0		/* prefetch 1 cacheline ahead */

	ldw		128(%r25), %r0		/* prefetch 2 */
@@ -355,7 +355,7 @@ ENTRY(copy_user_page_asm) 
	 * use ldd/std on a 32 bit kernel.

	 */

	ldw		0(%r25), %r19

	ldi		ASM_PAGE_SIZE_DIV64, %r1

	ldi		(PAGE_SIZE / 64), %r1



1:

	ldw		4(%r25), %r20
@@ -553,7 +553,7 @@ ENTRY(__clear_user_page_asm) 
	pdtlb		0(%r28)



#ifdef CONFIG_64BIT

	ldi		ASM_PAGE_SIZE_DIV128, %r1

	ldi		(PAGE_SIZE / 128), %r1



	/* PREFETCH (Write) has not (yet) been proven to help here */

	/* #define	PREFETCHW_OP	ldd		256(%0), %r0 */
@@ -578,7 +578,7 @@ ENTRY(__clear_user_page_asm) 
	ldo		128(%r28), %r28



#else	/* ! CONFIG_64BIT */

	ldi		ASM_PAGE_SIZE_DIV64, %r1

	ldi		(PAGE_SIZE / 64), %r1



1:

	stw		%r0, 0(%r28)