Merge /spare/repo/linux-2.6/

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / kprobes.h

diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h
index 7b700035e36de10211df784b66921d126f55a08e..573a3574a24fe86ebcd4ecb5be7800c3057b4df5 100644 (file)
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
@@ -28,6 +28,7 @@
 #include <linux/ptrace.h>
 #include <asm/break.h>
 
+#define MAX_INSN_SIZE   16
 #define BREAK_INST     (long)(__IA64_BREAK_KPROBE << 6)
 
 typedef union cmp_inst {
@@ -63,6 +64,8 @@ typedef struct _bundle {
 
 #define JPROBE_ENTRY(pentry)   (kprobe_opcode_t *)pentry
 
+#define ARCH_SUPPORTS_KRETPROBES
+
 #define SLOT0_OPCODE_SHIFT     (37)
 #define SLOT1_p1_OPCODE_SHIFT  (37 - (64-46))
 #define SLOT2_OPCODE_SHIFT     (37)
@@ -89,15 +92,11 @@ struct arch_specific_insn {
        kprobe_opcode_t insn;
  #define INST_FLAG_FIX_RELATIVE_IP_ADDR                1
  #define INST_FLAG_FIX_BRANCH_REG              2
+ #define INST_FLAG_BREAK_INST                  4
        unsigned long inst_flag;
        unsigned short target_br_reg;
 };
 
-/* ia64 does not need this */
-static inline void jprobe_return(void)
-{
-}
-
 /* ia64 does not need this */
 static inline void arch_copy_kprobe(struct kprobe *p)
 {
@@ -106,6 +105,12 @@ static inline void arch_copy_kprobe(struct kprobe *p)
 #ifdef CONFIG_KPROBES
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                    unsigned long val, void *data);
+
+/* ia64 does not need this */
+static inline void jprobe_return(void)
+{
+}
+
 #else                          /* !CONFIG_KPROBES */
 static inline int kprobe_exceptions_notify(struct notifier_block *self,
                                           unsigned long val, void *data)