1 files changed, 80 insertions, 19 deletions

diff --git a/arch/ia64/kernel/paravirtentry.S b/arch/ia64/kernel/paravirtentry.S
index 2f42fcb9776..6158560d7f1 100644
--- a/arch/ia64/kernel/paravirtentry.S
+++ b/arch/ia64/kernel/paravirtentry.S
@@ -20,8 +20,11 @@
  *
  */
 
+#include <linux/init.h>
 #include <asm/asmmacro.h>
 #include <asm/asm-offsets.h>
+#include <asm/paravirt_privop.h>
+#include <asm/paravirt_patch.h>
 #include "entry.h"
 
 #define DATA8(sym, init_value)                  \
@@ -32,29 +35,87 @@
         data8 init_value ;                      \
         .popsection
 
-#define BRANCH(targ, reg, breg)         \
-        movl reg=targ ;                 \
-        ;;                              \
-        ld8 reg=[reg] ;                 \
-        ;;                              \
-        mov breg=reg ;                  \
+#define BRANCH(targ, reg, breg, type)                                   \
+        PARAVIRT_PATCH_SITE_BR(PARAVIRT_PATCH_TYPE_BR_ ## type) ;       \
+        ;;                                                              \
+        movl reg=targ ;                                                 \
+        ;;                                                              \
+        ld8 reg=[reg] ;                                                 \
+        ;;                                                              \
+        mov breg=reg ;                                                  \
         br.cond.sptk.many breg
 
-#define BRANCH_PROC(sym, reg, breg)                             \
-        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \
-        GLOBAL_ENTRY(paravirt_ ## sym) ;                        \
-                BRANCH(paravirt_ ## sym ## _targ, reg, breg) ;  \
+#define BRANCH_PROC(sym, reg, breg, type)                               \
+        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ;         \
+        GLOBAL_ENTRY(paravirt_ ## sym) ;                                \
+                BRANCH(paravirt_ ## sym ## _targ, reg, breg, type) ;    \
         END(paravirt_ ## sym)
 
-#define BRANCH_PROC_UNWINFO(sym, reg, breg)                     \
-        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \
-        GLOBAL_ENTRY(paravirt_ ## sym) ;                        \
-                PT_REGS_UNWIND_INFO(0) ;                        \
-                BRANCH(paravirt_ ## sym ## _targ, reg, breg) ;  \
+#define BRANCH_PROC_UNWINFO(sym, reg, breg, type)                       \
+        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ;         \
+        GLOBAL_ENTRY(paravirt_ ## sym) ;                                \
+                PT_REGS_UNWIND_INFO(0) ;                                \
+                BRANCH(paravirt_ ## sym ## _targ, reg, breg, type) ;    \
         END(paravirt_ ## sym)
 
 
-BRANCH_PROC(switch_to, r22, b7)
-BRANCH_PROC_UNWINFO(leave_syscall, r22, b7)
-BRANCH_PROC(work_processed_syscall, r2, b7)
-BRANCH_PROC_UNWINFO(leave_kernel, r22, b7)
+BRANCH_PROC(switch_to, r22, b7, SWITCH_TO)
+BRANCH_PROC_UNWINFO(leave_syscall, r22, b7, LEAVE_SYSCALL)
+BRANCH_PROC(work_processed_syscall, r2, b7, WORK_PROCESSED_SYSCALL)
+BRANCH_PROC_UNWINFO(leave_kernel, r22, b7, LEAVE_KERNEL)
+
+
+#ifdef CONFIG_MODULES
+#define __INIT_OR_MODULE        .text
+#define __INITDATA_OR_MODULE    .data
+#else
+#define __INIT_OR_MODULE        __INIT
+#define __INITDATA_OR_MODULE    __INITDATA
+#endif /* CONFIG_MODULES */
+
+        __INIT_OR_MODULE
+        GLOBAL_ENTRY(paravirt_fc_i)
+        fc.i r32
+        br.ret.sptk.many rp
+        END(paravirt_fc_i)
+        __FINIT
+
+        __INIT_OR_MODULE
+        .align 32
+        GLOBAL_ENTRY(paravirt_nop_b_inst_bundle)
+        {
+                nop.b 0
+                nop.b 0
+                nop.b 0
+        }
+        END(paravirt_nop_b_inst_bundle)
+        __FINIT
+
+        /* NOTE: nop.[mfi] has same format */
+        __INIT_OR_MODULE
+        GLOBAL_ENTRY(paravirt_nop_mfi_inst_bundle)
+        {
+                nop.m 0
+                nop.f 0
+                nop.i 0
+        }
+        END(paravirt_nop_mfi_inst_bundle)
+        __FINIT
+
+        __INIT_OR_MODULE
+        GLOBAL_ENTRY(paravirt_nop_bundle)
+paravirt_nop_bundle_start:
+        {
+                nop 0
+                nop 0
+                nop 0
+        }
+paravirt_nop_bundle_end:
+        END(paravirt_nop_bundle)
+        __FINIT
+
+        __INITDATA_OR_MODULE
+        .align 8
+        .global paravirt_nop_bundle_size
+paravirt_nop_bundle_size:
+        data8   paravirt_nop_bundle_end - paravirt_nop_bundle_start