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

Commit c18377c3 authored Mar 07, 2014 by David A. Long

ARM: Move generic arm instruction parsing code to new files for sharing between features

Move the arm version of the kprobes instruction parsing code into more generic
files from where it can be used by uprobes and possibly other subsystems. The
symbol names will be made more generic in a subsequent part of this patchset.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>

parent b2531dd5

arch/arm/include/asm/probes.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,8 @@
	#ifndef _ASM_PROBES_H		#ifndef _ASM_PROBES_H
	#define _ASM_PROBES_H		#define _ASM_PROBES_H

			struct kprobe;

	typedef void (kprobe_insn_handler_t)(struct kprobe , struct pt_regs );		typedef void (kprobe_insn_handler_t)(struct kprobe , struct pt_regs );
	typedef unsigned long (kprobe_check_cc)(unsigned long);		typedef unsigned long (kprobe_check_cc)(unsigned long);
	typedef void (kprobe_insn_singlestep_t)(struct kprobe , struct pt_regs );		typedef void (kprobe_insn_singlestep_t)(struct kprobe , struct pt_regs );

arch/arm/kernel/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -50,11 +50,11 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o
	obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o		obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o
	obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o		obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o
	obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o		obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
	obj-$(CONFIG_KPROBES) += kprobes.o kprobes-common.o patch.o		obj-$(CONFIG_KPROBES) += probes.o kprobes.o kprobes-common.o patch.o
	ifdef CONFIG_THUMB2_KERNEL		ifdef CONFIG_THUMB2_KERNEL
	obj-$(CONFIG_KPROBES) += kprobes-thumb.o		obj-$(CONFIG_KPROBES) += kprobes-thumb.o
	else		else
	obj-$(CONFIG_KPROBES) += kprobes-arm.o		obj-$(CONFIG_KPROBES) += kprobes-arm.o probes-arm.o
	endif		endif
	obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o		obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
	test-kprobes-objs := kprobes-test.o		test-kprobes-objs := kprobes-test.o