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

Commit f684199f authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt
Browse files

kprobes/x86: Move kprobes stuff under arch/x86/kernel/kprobes/ 

Move arch-dep kprobes stuff under arch/x86/kernel/kprobes.

Link: http://lkml.kernel.org/r/20120928081522.3560.75469.stgit@ltc138.sdl.hitachi.co.jp



Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
[ fixed whitespace and s/__attribute__((packed))/__packed/ ]
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent e7dbfe34

arch/x86/kernel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ obj-$(CONFIG_X86_TSC) += trace_clock.o 
obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o

obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_OPTPROBES)		+= kprobes-opt.o

obj-$(CONFIG_KPROBES_ON_FTRACE)	+= kprobes-ftrace.o

obj-y				+= kprobes/

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault_32.o

obj-$(CONFIG_KGDB)		+= kgdb.o

arch/x86/kernel/kprobes/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Makefile for kernel probes

#



obj-$(CONFIG_KPROBES)		+= core.o

obj-$(CONFIG_OPTPROBES)		+= opt.o

obj-$(CONFIG_KPROBES_ON_FTRACE)	+= ftrace.o

arch/x86/kernel/kprobes.c→arch/x86/kernel/kprobes/core.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#include <asm/insn.h>

#include <asm/debugreg.h>



#include "kprobes-common.h"

#include "common.h"



void jprobe_return_end(void);
@@ -117,7 +117,7 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op) 
	struct __arch_relative_insn {

		u8 op;

		s32 raddr;

	} __attribute__((packed)) *insn;

	} __packed *insn;



	insn = (struct __arch_relative_insn *)from;

	insn->raddr = (s32)((long)(to) - ((long)(from) + 5));

arch/x86/kernel/kprobes-ftrace.c→arch/x86/kernel/kprobes/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/preempt.h>

#include <linux/ftrace.h>



#include "kprobes-common.h"

#include "common.h"



static int __skip_singlestep(struct kprobe *p, struct pt_regs *regs,

			     struct kprobe_ctlblk *kcb)