Commit fca08f32 authored by Wang Nan's avatar Wang Nan Committed by Jon Medhurst
Browse files

ARM: probes: move all probe code to dedicate directory 

In discussion on LKML (https://lkml.org/lkml/2014/11/28/158

), Russell
King suggests to move all probe related code to arch/arm/probes. This
patch does the work. Due to dependency on 'arch/arm/kernel/patch.h', this
patch also moves patch.h to 'arch/arm/include/asm/patch.h', and related
'#include' directives are also midified to '#include <asm/patch.h>'.

Following is an overview of this patch:

 ./arch/arm/kernel/               ./arch/arm/probes/
 |-- Makefile                     |-- Makefile
 |-- probes-arm.c          ==>    |-- decode-arm.c
 |-- probes-arm.h          ==>    |-- decode-arm.h
 |-- probes-thumb.c        ==>    |-- decode-thumb.c
 |-- probes-thumb.h        ==>    |-- decode-thumb.h
 |-- probes.c              ==>    |-- decode.c
 |-- probes.h              ==>    |-- decode.h
 |                                |-- kprobes
 |                                |   |-- Makefile
 |-- kprobes-arm.c         ==>    |   |-- actions-arm.c
 |-- kprobes-common.c      ==>    |   |-- actions-common.c
 |-- kprobes-thumb.c       ==>    |   |-- actions-thumb.c
 |-- kprobes.c             ==>    |   |-- core.c
 |-- kprobes.h             ==>    |   |-- core.h
 |-- kprobes-test-arm.c    ==>    |   |-- test-arm.c
 |-- kprobes-test.c        ==>    |   |-- test-core.c
 |-- kprobes-test.h        ==>    |   |-- test-core.h
 |-- kprobes-test-thumb.c  ==>    |   `-- test-thumb.c
 |                                `-- uprobes
 |                                    |-- Makefile
 |-- uprobes-arm.c         ==>        |-- actions-arm.c
 |-- uprobes.c             ==>        |-- core.c
 |-- uprobes.h             ==>        `-- core.h
 |
 `-- patch.h               ==>    arch/arm/include/asm/patch.h

Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarJon Medhurst <tixy@linaro.org>
parent b1940cd2

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ 


# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/

core-y				+= arch/arm/probes/

core-y				+= arch/arm/net/

core-y				+= arch/arm/crypto/

core-y				+= arch/arm/firmware/

arch/arm/kernel/Makefile

+2 −14
Original line number Diff line number Diff line
@@ -51,20 +51,8 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += 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_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_UPROBES)		+= probes.o probes-arm.o uprobes.o uprobes-arm.o

obj-$(CONFIG_KPROBES)		+= probes.o kprobes.o kprobes-common.o patch.o

ifdef CONFIG_THUMB2_KERNEL

obj-$(CONFIG_KPROBES)		+= kprobes-thumb.o probes-thumb.o

else

obj-$(CONFIG_KPROBES)		+= kprobes-arm.o probes-arm.o

endif

obj-$(CONFIG_ARM_KPROBES_TEST)	+= test-kprobes.o

test-kprobes-objs		:= kprobes-test.o

ifdef CONFIG_THUMB2_KERNEL

test-kprobes-objs		+= kprobes-test-thumb.o

else

test-kprobes-objs		+= kprobes-test-arm.o

endif

# Main staffs in KPROBES are in arch/arm/probes/ .

obj-$(CONFIG_KPROBES)		+= patch.o

obj-$(CONFIG_OABI_COMPAT)	+= sys_oabi-compat.o

obj-$(CONFIG_ARM_THUMBEE)	+= thumbee.o

obj-$(CONFIG_KGDB)		+= kgdb.o patch.o

arch/arm/kernel/jump_label.c

+1 −1
Original line number Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/jump_label.h>

#include <asm/patch.h>



#include "insn.h"

#include "patch.h"



#ifdef HAVE_JUMP_LABEL

arch/arm/kernel/kgdb.c

+1 −2
Original line number Diff line number Diff line
@@ -14,10 +14,9 @@ 
#include <linux/kgdb.h>

#include <linux/uaccess.h>



#include <asm/patch.h>

#include <asm/traps.h>



#include "patch.h"



struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] =

{

	{ "r0", 4, offsetof(struct pt_regs, ARM_r0)},

CRA Git | Maintained and supported by SUSTech CRA and CCSE