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

Commit 625a3b60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 {

arch/arm/kernel/kprobes-decode.c

+457 −320

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/kernel/kprobes.c

+2 −1
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static void __kprobes singlestep(struct kprobe *p, struct pt_regs *regs, 
				 struct kprobe_ctlblk *kcb)

{

	regs->ARM_pc += 4;

	if (p->ainsn.insn_check_cc(regs->ARM_cpsr))

		p->ainsn.insn_handler(p, regs);

}

arch/arm/kernel/perf_event.c

+2 −1
Original line number Diff line number Diff line
@@ -746,7 +746,8 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) 


	tail = (struct frame_tail __user *)regs->ARM_fp - 1;



	while (tail && !((unsigned long)tail & 0x3))

	while ((entry->nr < PERF_MAX_STACK_DEPTH) &&

	       tail && !((unsigned long)tail & 0x3))

		tail = user_backtrace(tail, entry);

}

arch/arm/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static void broadcast_timer_set_mode(enum clock_event_mode mode, 
{

}



static void broadcast_timer_setup(struct clock_event_device *evt)

static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)

{

	evt->name	= "dummy_timer";

	evt->features	= CLOCK_EVT_FEAT_ONESHOT |