Commit 625a3b60 authored May 02, 2011 by Linus Torvalds

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm: (47 commits)
  CLKDEV: Fix clkdev return value for NULL clk case
  ARM: 6891/1: prevent heap corruption in OABI semtimedop
  ARM: kprobes: Tidy-up kprobes-decode.c
  ARM: kprobes: Add emulation of hint instructions like NOP and WFI
  ARM: kprobes: Add emulation of SBFX, UBFX, BFI and BFC instructions
  ARM: kprobes: Add emulation of MOVW and MOVT instructions
  ARM: kprobes: Reject probing of undefined data processing instructions
  ARM: kprobes: Remove redundant code in space_1111
  ARM: kprobes: Fix emulation of PLD instructions
  ARM: kprobes: Reject probing of SETEND instructions
  ARM: kprobes: Consolidate stub decoding functions
  ARM: kprobes: Reject probing of all coprocessor instructions
  ARM: kprobes: Fix emulation of USAD8 instructions
  ARM: kprobes: Fix emulation of SMUAD, SMUSD and SMMUL instructions
  ARM: kprobes: Fix emulation of SXTB16, SXTB, SXTH, UXTB16, UXTB and UXTH instructions
  ARM: kprobes: Reject probing of undefined media instructions
  ARM: kprobes: Add emulation of RBIT instruction
  ARM: kprobes: Reject probing of LDRB instructions which load PC
  ARM: kprobes: Fix emulation of LDRD and STRD instructions
  ARM: kprobes: Reject probing of LDR/STR instructions which update PC unpredictably
  ...

parents c7bcecbe e8bf8df9

arch/arm/include/asm/kprobes.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -39,10 +39,13 @@ typedef u32 kprobe_opcode_t;
		struct kprobe;
		typedef void (kprobe_insn_handler_t)(struct kprobe , struct pt_regs );

		typedef unsigned long (kprobe_check_cc)(unsigned long);

		/* Architecture specific copy of original instruction. */
		struct arch_specific_insn {
		kprobe_opcode_t *insn;
		kprobe_insn_handler_t *insn_handler;
		kprobe_check_cc *insn_check_cc;
		};

		struct prev_kprobe {

Admin message