Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13608d64 authored by Rusty Lynch's avatar Rusty Lynch Committed by Linus Torvalds
Browse files

[PATCH] Kprobes ia64 qp fix 



Fix a bug where a kprobe still fires when the instruction is predicated
off.  So given the p6=0, and we have an instruction like:

(p6) move loc1=0

we should not be triggering the kprobe.  This is handled by carrying over
the qp section of the original instruction into the break instruction.

Signed-off-by: default avatarAnil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: default avatarRusty Lynch <Rusty.lynch@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8bc76772

arch/ia64/kernel/kprobes.c

+3 −3
Original line number Diff line number Diff line
@@ -115,19 +115,19 @@ int arch_prepare_kprobe(struct kprobe *p) 
	case 0:

 		major_opcode = (bundle->quad0.slot0 >> SLOT0_OPCODE_SHIFT);

 		kprobe_inst = bundle->quad0.slot0;

		bundle->quad0.slot0 = BREAK_INST;

		bundle->quad0.slot0 = BREAK_INST | (0x3f & kprobe_inst);

		break;

	case 1:

 		major_opcode = (bundle->quad1.slot1_p1 >> SLOT1_p1_OPCODE_SHIFT);

 		kprobe_inst = (bundle->quad0.slot1_p0 |

 				(bundle->quad1.slot1_p1 << (64-46)));

		bundle->quad0.slot1_p0 = BREAK_INST;

		bundle->quad0.slot1_p0 = BREAK_INST | (0x3f & kprobe_inst);

		bundle->quad1.slot1_p1 = (BREAK_INST >> (64-46));

		break;

	case 2:

 		major_opcode = (bundle->quad1.slot2 >> SLOT2_OPCODE_SHIFT);

 		kprobe_inst = bundle->quad1.slot2;

		bundle->quad1.slot2 = BREAK_INST;

		bundle->quad1.slot2 = BREAK_INST | (0x3f & kprobe_inst);

		break;

	}