Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h
index cec4d99583075d8b4e9f8da760e356e6d3bb30af..bf36a32e37e4661dd4abaa944f55e7776c16ee65 100644 (file)
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
@@ -28,8 +28,26 @@
 #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 {
+       struct {
+       unsigned long long qp : 6;
+       unsigned long long p1 : 6;
+       unsigned long long c  : 1;
+       unsigned long long r2 : 7;
+       unsigned long long r3 : 7;
+       unsigned long long p2 : 6;
+       unsigned long long ta : 1;
+       unsigned long long x2 : 2;
+       unsigned long long tb : 1;
+       unsigned long long opcode : 4;
+       unsigned long long reserved : 23;
+       }f;
+       unsigned long long l;
+} cmp_inst_t;
+
 struct kprobe;
 
 typedef struct _bundle {
@@ -46,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)
@@ -76,11 +96,6 @@ struct arch_specific_insn {
        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)
 {
@@ -89,6 +104,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)