diff options
Diffstat (limited to 'arch/parisc/kernel/syscall.S')
-rw-r--r-- | arch/parisc/kernel/syscall.S | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index 56f6231cb863..69b6eebc466e 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <asm/asm-offsets.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
12 | #include <asm/errno.h> | 12 | #include <asm/errno.h> |
13 | #include <asm/page.h> | ||
13 | #include <asm/psw.h> | 14 | #include <asm/psw.h> |
14 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
15 | #include <asm/assembly.h> | 16 | #include <asm/assembly.h> |
@@ -38,7 +39,7 @@ | |||
38 | * pointers. | 39 | * pointers. |
39 | */ | 40 | */ |
40 | 41 | ||
41 | .align ASM_PAGE_SIZE | 42 | .align PAGE_SIZE |
42 | ENTRY(linux_gateway_page) | 43 | ENTRY(linux_gateway_page) |
43 | 44 | ||
44 | /* ADDRESS 0x00 to 0xb0 = 176 bytes / 4 bytes per insn = 44 insns */ | 45 | /* ADDRESS 0x00 to 0xb0 = 176 bytes / 4 bytes per insn = 44 insns */ |
@@ -597,7 +598,7 @@ cas_action: | |||
597 | 598 | ||
598 | 599 | ||
599 | /* Make sure nothing else is placed on this page */ | 600 | /* Make sure nothing else is placed on this page */ |
600 | .align ASM_PAGE_SIZE | 601 | .align PAGE_SIZE |
601 | END(linux_gateway_page) | 602 | END(linux_gateway_page) |
602 | ENTRY(end_linux_gateway_page) | 603 | ENTRY(end_linux_gateway_page) |
603 | 604 | ||
@@ -608,7 +609,7 @@ ENTRY(end_linux_gateway_page) | |||
608 | 609 | ||
609 | .section .rodata,"a" | 610 | .section .rodata,"a" |
610 | 611 | ||
611 | .align ASM_PAGE_SIZE | 612 | .align PAGE_SIZE |
612 | /* Light-weight-syscall table */ | 613 | /* Light-weight-syscall table */ |
613 | /* Start of lws table. */ | 614 | /* Start of lws table. */ |
614 | ENTRY(lws_table) | 615 | ENTRY(lws_table) |
@@ -617,13 +618,13 @@ ENTRY(lws_table) | |||
617 | END(lws_table) | 618 | END(lws_table) |
618 | /* End of lws table */ | 619 | /* End of lws table */ |
619 | 620 | ||
620 | .align ASM_PAGE_SIZE | 621 | .align PAGE_SIZE |
621 | ENTRY(sys_call_table) | 622 | ENTRY(sys_call_table) |
622 | #include "syscall_table.S" | 623 | #include "syscall_table.S" |
623 | END(sys_call_table) | 624 | END(sys_call_table) |
624 | 625 | ||
625 | #ifdef CONFIG_64BIT | 626 | #ifdef CONFIG_64BIT |
626 | .align ASM_PAGE_SIZE | 627 | .align PAGE_SIZE |
627 | ENTRY(sys_call_table64) | 628 | ENTRY(sys_call_table64) |
628 | #define SYSCALL_TABLE_64BIT | 629 | #define SYSCALL_TABLE_64BIT |
629 | #include "syscall_table.S" | 630 | #include "syscall_table.S" |
@@ -636,7 +637,7 @@ END(sys_call_table64) | |||
636 | will use this set of locks | 637 | will use this set of locks |
637 | */ | 638 | */ |
638 | .section .data | 639 | .section .data |
639 | .align 4096 | 640 | .align PAGE_SIZE |
640 | ENTRY(lws_lock_start) | 641 | ENTRY(lws_lock_start) |
641 | /* lws locks */ | 642 | /* lws locks */ |
642 | .align 16 | 643 | .align 16 |