[PARISC] Clean up pointless ASM_PAGE_SIZE_DIV use

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c
index 8c2bcdbd494acb618d3b319fe8174ca646610c94..eaa79bc14d9463fcce66b5acc96014d15f9433f4 100644 (file)
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
@@ -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));

diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 90b240878520b9c41f28ccbcbfc9a663f7c3e571..5901092e0196b855e64845f0c483fedb774a62d4 100644 (file)
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -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)