diff options
Diffstat (limited to 'arch/ia64/kernel/paravirtentry.S')
| -rw-r--r-- | arch/ia64/kernel/paravirtentry.S | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/arch/ia64/kernel/paravirtentry.S b/arch/ia64/kernel/paravirtentry.S index 80c0d365cbc0..6158560d7f17 100644 --- a/arch/ia64/kernel/paravirtentry.S +++ b/arch/ia64/kernel/paravirtentry.S | |||
| @@ -20,8 +20,11 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/init.h> | ||
| 23 | #include <asm/asmmacro.h> | 24 | #include <asm/asmmacro.h> |
| 24 | #include <asm/asm-offsets.h> | 25 | #include <asm/asm-offsets.h> |
| 26 | #include <asm/paravirt_privop.h> | ||
| 27 | #include <asm/paravirt_patch.h> | ||
| 25 | #include "entry.h" | 28 | #include "entry.h" |
| 26 | 29 | ||
| 27 | #define DATA8(sym, init_value) \ | 30 | #define DATA8(sym, init_value) \ |
| @@ -32,32 +35,34 @@ | |||
| 32 | data8 init_value ; \ | 35 | data8 init_value ; \ |
| 33 | .popsection | 36 | .popsection |
| 34 | 37 | ||
| 35 | #define BRANCH(targ, reg, breg) \ | 38 | #define BRANCH(targ, reg, breg, type) \ |
| 36 | movl reg=targ ; \ | 39 | PARAVIRT_PATCH_SITE_BR(PARAVIRT_PATCH_TYPE_BR_ ## type) ; \ |
| 37 | ;; \ | 40 | ;; \ |
| 38 | ld8 reg=[reg] ; \ | 41 | movl reg=targ ; \ |
| 39 | ;; \ | 42 | ;; \ |
| 40 | mov breg=reg ; \ | 43 | ld8 reg=[reg] ; \ |
| 44 | ;; \ | ||
| 45 | mov breg=reg ; \ | ||
| 41 | br.cond.sptk.many breg | 46 | br.cond.sptk.many breg |
| 42 | 47 | ||
| 43 | #define BRANCH_PROC(sym, reg, breg) \ | 48 | #define BRANCH_PROC(sym, reg, breg, type) \ |
| 44 | DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \ | 49 | DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \ |
| 45 | GLOBAL_ENTRY(paravirt_ ## sym) ; \ | 50 | GLOBAL_ENTRY(paravirt_ ## sym) ; \ |
| 46 | BRANCH(paravirt_ ## sym ## _targ, reg, breg) ; \ | 51 | BRANCH(paravirt_ ## sym ## _targ, reg, breg, type) ; \ |
| 47 | END(paravirt_ ## sym) | 52 | END(paravirt_ ## sym) |
| 48 | 53 | ||
| 49 | #define BRANCH_PROC_UNWINFO(sym, reg, breg) \ | 54 | #define BRANCH_PROC_UNWINFO(sym, reg, breg, type) \ |
| 50 | DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \ | 55 | DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \ |
| 51 | GLOBAL_ENTRY(paravirt_ ## sym) ; \ | 56 | GLOBAL_ENTRY(paravirt_ ## sym) ; \ |
| 52 | PT_REGS_UNWIND_INFO(0) ; \ | 57 | PT_REGS_UNWIND_INFO(0) ; \ |
| 53 | BRANCH(paravirt_ ## sym ## _targ, reg, breg) ; \ | 58 | BRANCH(paravirt_ ## sym ## _targ, reg, breg, type) ; \ |
| 54 | END(paravirt_ ## sym) | 59 | END(paravirt_ ## sym) |
| 55 | 60 | ||
| 56 | 61 | ||
| 57 | BRANCH_PROC(switch_to, r22, b7) | 62 | BRANCH_PROC(switch_to, r22, b7, SWITCH_TO) |
| 58 | BRANCH_PROC_UNWINFO(leave_syscall, r22, b7) | 63 | BRANCH_PROC_UNWINFO(leave_syscall, r22, b7, LEAVE_SYSCALL) |
| 59 | BRANCH_PROC(work_processed_syscall, r2, b7) | 64 | BRANCH_PROC(work_processed_syscall, r2, b7, WORK_PROCESSED_SYSCALL) |
| 60 | BRANCH_PROC_UNWINFO(leave_kernel, r22, b7) | 65 | BRANCH_PROC_UNWINFO(leave_kernel, r22, b7, LEAVE_KERNEL) |
| 61 | 66 | ||
| 62 | 67 | ||
| 63 | #ifdef CONFIG_MODULES | 68 | #ifdef CONFIG_MODULES |