diff options
Diffstat (limited to 'arch/ia64/kernel/fsys.S')
-rw-r--r-- | arch/ia64/kernel/fsys.S | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S index abc6dee3799c..edbf7af95849 100644 --- a/arch/ia64/kernel/fsys.S +++ b/arch/ia64/kernel/fsys.S | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <asm/unistd.h> | 24 | #include <asm/unistd.h> |
25 | 25 | ||
26 | #include "entry.h" | 26 | #include "entry.h" |
27 | #include "paravirt_inst.h" | 27 | #include <asm/native/inst.h> |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * See Documentation/ia64/fsys.txt for details on fsyscalls. | 30 | * See Documentation/ia64/fsys.txt for details on fsyscalls. |
@@ -402,7 +402,7 @@ ENTRY(fsys_fallback_syscall) | |||
402 | mov r26=ar.pfs | 402 | mov r26=ar.pfs |
403 | END(fsys_fallback_syscall) | 403 | END(fsys_fallback_syscall) |
404 | /* FALL THROUGH */ | 404 | /* FALL THROUGH */ |
405 | GLOBAL_ENTRY(paravirt_fsys_bubble_down) | 405 | GLOBAL_ENTRY(fsys_bubble_down) |
406 | .prologue | 406 | .prologue |
407 | .altrp b6 | 407 | .altrp b6 |
408 | .body | 408 | .body |
@@ -440,7 +440,7 @@ GLOBAL_ENTRY(paravirt_fsys_bubble_down) | |||
440 | * | 440 | * |
441 | * PSR.BE : already is turned off in __kernel_syscall_via_epc() | 441 | * PSR.BE : already is turned off in __kernel_syscall_via_epc() |
442 | * PSR.AC : don't care (kernel normally turns PSR.AC on) | 442 | * PSR.AC : don't care (kernel normally turns PSR.AC on) |
443 | * PSR.I : already turned off by the time paravirt_fsys_bubble_down gets | 443 | * PSR.I : already turned off by the time fsys_bubble_down gets |
444 | * invoked | 444 | * invoked |
445 | * PSR.DFL: always 0 (kernel never turns it on) | 445 | * PSR.DFL: always 0 (kernel never turns it on) |
446 | * PSR.DFH: don't care --- kernel never touches f32-f127 on its own | 446 | * PSR.DFH: don't care --- kernel never touches f32-f127 on its own |
@@ -450,7 +450,7 @@ GLOBAL_ENTRY(paravirt_fsys_bubble_down) | |||
450 | * PSR.DB : don't care --- kernel never enables kernel-level | 450 | * PSR.DB : don't care --- kernel never enables kernel-level |
451 | * breakpoints | 451 | * breakpoints |
452 | * PSR.TB : must be 0 already; if it wasn't zero on entry to | 452 | * PSR.TB : must be 0 already; if it wasn't zero on entry to |
453 | * __kernel_syscall_via_epc, the branch to paravirt_fsys_bubble_down | 453 | * __kernel_syscall_via_epc, the branch to fsys_bubble_down |
454 | * will trigger a taken branch; the taken-trap-handler then | 454 | * will trigger a taken branch; the taken-trap-handler then |
455 | * converts the syscall into a break-based system-call. | 455 | * converts the syscall into a break-based system-call. |
456 | */ | 456 | */ |
@@ -541,14 +541,14 @@ GLOBAL_ENTRY(paravirt_fsys_bubble_down) | |||
541 | nop.m 0 | 541 | nop.m 0 |
542 | (p8) br.call.sptk.many b6=b6 // B (ignore return address) | 542 | (p8) br.call.sptk.many b6=b6 // B (ignore return address) |
543 | br.cond.spnt ia64_trace_syscall // B | 543 | br.cond.spnt ia64_trace_syscall // B |
544 | END(paravirt_fsys_bubble_down) | 544 | END(fsys_bubble_down) |
545 | 545 | ||
546 | .rodata | 546 | .rodata |
547 | .align 8 | 547 | .align 8 |
548 | .globl paravirt_fsyscall_table | 548 | .globl fsyscall_table |
549 | 549 | ||
550 | data8 paravirt_fsys_bubble_down | 550 | data8 fsys_bubble_down |
551 | paravirt_fsyscall_table: | 551 | fsyscall_table: |
552 | data8 fsys_ni_syscall | 552 | data8 fsys_ni_syscall |
553 | data8 0 // exit // 1025 | 553 | data8 0 // exit // 1025 |
554 | data8 0 // read | 554 | data8 0 // read |
@@ -833,4 +833,4 @@ paravirt_fsyscall_table: | |||
833 | 833 | ||
834 | // fill in zeros for the remaining entries | 834 | // fill in zeros for the remaining entries |
835 | .zero: | 835 | .zero: |
836 | .space paravirt_fsyscall_table + 8*NR_syscalls - .zero, 0 | 836 | .space fsyscall_table + 8*NR_syscalls - .zero, 0 |