diff options
-rw-r--r-- | arch/parisc/kernel/asm-offsets.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/pacache.S | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c index 8c2bcdbd494a..eaa79bc14d94 100644 --- a/arch/parisc/kernel/asm-offsets.c +++ b/arch/parisc/kernel/asm-offsets.c | |||
@@ -290,8 +290,6 @@ int main(void) | |||
290 | DEFINE(ASM_PTE_ENTRY_SIZE, PTE_ENTRY_SIZE); | 290 | DEFINE(ASM_PTE_ENTRY_SIZE, PTE_ENTRY_SIZE); |
291 | DEFINE(ASM_PFN_PTE_SHIFT, PFN_PTE_SHIFT); | 291 | DEFINE(ASM_PFN_PTE_SHIFT, PFN_PTE_SHIFT); |
292 | DEFINE(ASM_PT_INITIAL, PT_INITIAL); | 292 | DEFINE(ASM_PT_INITIAL, PT_INITIAL); |
293 | DEFINE(ASM_PAGE_SIZE_DIV64, PAGE_SIZE/64); | ||
294 | DEFINE(ASM_PAGE_SIZE_DIV128, PAGE_SIZE/128); | ||
295 | BLANK(); | 293 | BLANK(); |
296 | DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip)); | 294 | DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip)); |
297 | DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space)); | 295 | DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space)); |
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index 90b240878520..5901092e0196 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
@@ -289,7 +289,7 @@ ENTRY(copy_user_page_asm) | |||
289 | */ | 289 | */ |
290 | 290 | ||
291 | ldd 0(%r25), %r19 | 291 | ldd 0(%r25), %r19 |
292 | ldi ASM_PAGE_SIZE_DIV128, %r1 | 292 | ldi (PAGE_SIZE / 128), %r1 |
293 | 293 | ||
294 | ldw 64(%r25), %r0 /* prefetch 1 cacheline ahead */ | 294 | ldw 64(%r25), %r0 /* prefetch 1 cacheline ahead */ |
295 | ldw 128(%r25), %r0 /* prefetch 2 */ | 295 | ldw 128(%r25), %r0 /* prefetch 2 */ |
@@ -355,7 +355,7 @@ ENTRY(copy_user_page_asm) | |||
355 | * use ldd/std on a 32 bit kernel. | 355 | * use ldd/std on a 32 bit kernel. |
356 | */ | 356 | */ |
357 | ldw 0(%r25), %r19 | 357 | ldw 0(%r25), %r19 |
358 | ldi ASM_PAGE_SIZE_DIV64, %r1 | 358 | ldi (PAGE_SIZE / 64), %r1 |
359 | 359 | ||
360 | 1: | 360 | 1: |
361 | ldw 4(%r25), %r20 | 361 | ldw 4(%r25), %r20 |
@@ -553,7 +553,7 @@ ENTRY(__clear_user_page_asm) | |||
553 | pdtlb 0(%r28) | 553 | pdtlb 0(%r28) |
554 | 554 | ||
555 | #ifdef CONFIG_64BIT | 555 | #ifdef CONFIG_64BIT |
556 | ldi ASM_PAGE_SIZE_DIV128, %r1 | 556 | ldi (PAGE_SIZE / 128), %r1 |
557 | 557 | ||
558 | /* PREFETCH (Write) has not (yet) been proven to help here */ | 558 | /* PREFETCH (Write) has not (yet) been proven to help here */ |
559 | /* #define PREFETCHW_OP ldd 256(%0), %r0 */ | 559 | /* #define PREFETCHW_OP ldd 256(%0), %r0 */ |
@@ -578,7 +578,7 @@ ENTRY(__clear_user_page_asm) | |||
578 | ldo 128(%r28), %r28 | 578 | ldo 128(%r28), %r28 |
579 | 579 | ||
580 | #else /* ! CONFIG_64BIT */ | 580 | #else /* ! CONFIG_64BIT */ |
581 | ldi ASM_PAGE_SIZE_DIV64, %r1 | 581 | ldi (PAGE_SIZE / 64), %r1 |
582 | 582 | ||
583 | 1: | 583 | 1: |
584 | stw %r0, 0(%r28) | 584 | stw %r0, 0(%r28) |