diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-11-14 09:33:38 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-12-12 12:00:55 -0800 |
| commit | 08ed38b68099f2a492196414b08a7f5dd8dc3537 (patch) | |
| tree | 1be49040ba10db0fefc16a31c4ee13461c50e131 /include/asm-ia64 | |
| parent | 75f6a1de41f90543792403bf0ffb3ead59d0d8cc (diff) | |
| download | linux-08ed38b68099f2a492196414b08a7f5dd8dc3537.tar.bz2 | |
[IA64] enable trap code on slot 1
Because slot 1 of one instr bundle crosses border of two consecutive
8-bytes, kprobe on slot 1 is disabled. This patch enables kprobe on
slot1, it only replaces higher 8-bytes of the instruction bundle and
changes the exception code to ignore the low 12 bits of the break
number (which is across the border in the lower 8-bytes of the bundle).
For those instructions which must execute regardless qp bits,
kprobe on slot 1 is still disabled.
Signed-off-by: bibo,mao <bibo.mao@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/break.h | 4 | ||||
| -rw-r--r-- | include/asm-ia64/kprobes.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-ia64/break.h b/include/asm-ia64/break.h index 8167828edc4b..f03402039896 100644 --- a/include/asm-ia64/break.h +++ b/include/asm-ia64/break.h @@ -12,8 +12,8 @@ * OS-specific debug break numbers: */ #define __IA64_BREAK_KDB 0x80100 -#define __IA64_BREAK_KPROBE 0x80200 -#define __IA64_BREAK_JPROBE 0x80300 +#define __IA64_BREAK_KPROBE 0x81000 /* .. 0x81fff */ +#define __IA64_BREAK_JPROBE 0x82000 /* * OS-specific break numbers: diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h index 1b45b71c79b9..828ae00e47c1 100644 --- a/include/asm-ia64/kprobes.h +++ b/include/asm-ia64/kprobes.h @@ -115,6 +115,7 @@ struct arch_specific_insn { #define INST_FLAG_BREAK_INST 4 unsigned long inst_flag; unsigned short target_br_reg; + unsigned short slot; }; extern int kprobe_exceptions_notify(struct notifier_block *self, |