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

Commit 30a813ae authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

x86: Move MAX_INSN_SIZE into asm/insn.h 



Since there's now two users for this, place it in a common header.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: paulus@samba.org
Cc: eranian@google.com
Cc: robert.richter@amd.com
Cc: fweisbec@gmail.com
LKML-Reference: <20100304140100.923774125@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7e1a40dd

arch/x86/include/asm/insn.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ struct insn { 
	const insn_byte_t *next_byte;

	const insn_byte_t *next_byte;

};

};





#define MAX_INSN_SIZE	16



#define X86_MODRM_MOD(modrm) (((modrm) & 0xc0) >> 6)

#define X86_MODRM_MOD(modrm) (((modrm) & 0xc0) >> 6)

#define X86_MODRM_REG(modrm) (((modrm) & 0x38) >> 3)

#define X86_MODRM_REG(modrm) (((modrm) & 0x38) >> 3)

#define X86_MODRM_RM(modrm) ((modrm) & 0x07)

#define X86_MODRM_RM(modrm) ((modrm) & 0x07)

arch/x86/include/asm/kprobes.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <linux/ptrace.h>

#include <linux/ptrace.h>

#include <linux/percpu.h>

#include <linux/percpu.h>

#include <asm/insn.h>





#define  __ARCH_WANT_KPROBES_INSN_SLOT

#define  __ARCH_WANT_KPROBES_INSN_SLOT
@@ -36,7 +37,6 @@ typedef u8 kprobe_opcode_t; 
#define RELATIVEJUMP_SIZE 5

#define RELATIVEJUMP_SIZE 5

#define RELATIVECALL_OPCODE 0xe8

#define RELATIVECALL_OPCODE 0xe8

#define RELATIVE_ADDR_SIZE 4

#define RELATIVE_ADDR_SIZE 4

#define MAX_INSN_SIZE 16

#define MAX_STACK_SIZE 64

#define MAX_STACK_SIZE 64

#define MIN_STACK_SIZE(ADDR)					       \

#define MIN_STACK_SIZE(ADDR)					       \

	(((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \

	(((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \

arch/x86/kernel/cpu/perf_event_intel_ds.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -379,8 +379,6 @@ static void intel_pmu_pebs_disable_all(void) 




#include <asm/insn.h>

#include <asm/insn.h>





#define MAX_INSN_SIZE	16



static inline bool kernel_ip(unsigned long ip)

static inline bool kernel_ip(unsigned long ip)

{

{

#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32