diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/asm-ia64/kprobes.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/asm-ia64/kprobes.h')
| -rw-r--r-- | include/asm-ia64/kprobes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h index bf36a32e37e4..573a3574a24f 100644 --- a/include/asm-ia64/kprobes.h +++ b/include/asm-ia64/kprobes.h | |||
| @@ -92,6 +92,7 @@ struct arch_specific_insn { | |||
| 92 | kprobe_opcode_t insn; | 92 | kprobe_opcode_t insn; |
| 93 | #define INST_FLAG_FIX_RELATIVE_IP_ADDR 1 | 93 | #define INST_FLAG_FIX_RELATIVE_IP_ADDR 1 |
| 94 | #define INST_FLAG_FIX_BRANCH_REG 2 | 94 | #define INST_FLAG_FIX_BRANCH_REG 2 |
| 95 | #define INST_FLAG_BREAK_INST 4 | ||
| 95 | unsigned long inst_flag; | 96 | unsigned long inst_flag; |
| 96 | unsigned short target_br_reg; | 97 | unsigned short target_br_reg; |
| 97 | }; | 98 | }; |