lkml.org 
[lkml]   [2010]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/pebs] x86: Move MAX_INSN_SIZE into asm/insn.h
    Commit-ID:  30a813ae035d3e220a89609adce878e045c49547
    Gitweb: http://git.kernel.org/tip/30a813ae035d3e220a89609adce878e045c49547
    Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    AuthorDate: Thu, 4 Mar 2010 13:49:21 +0100
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 10 Mar 2010 13:23:34 +0100

    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: Peter 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: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/include/asm/insn.h | 2 ++
    arch/x86/include/asm/kprobes.h | 2 +-
    arch/x86/kernel/cpu/perf_event_intel_ds.c | 2 --
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/include/asm/insn.h b/arch/x86/include/asm/insn.h
    index 96c2e0a..88c765e 100644
    --- a/arch/x86/include/asm/insn.h
    +++ b/arch/x86/include/asm/insn.h
    @@ -68,6 +68,8 @@ struct insn {
    const insn_byte_t *next_byte;
    };

    +#define MAX_INSN_SIZE 16
    +
    #define X86_MODRM_MOD(modrm) (((modrm) & 0xc0) >> 6)
    #define X86_MODRM_REG(modrm) (((modrm) & 0x38) >> 3)
    #define X86_MODRM_RM(modrm) ((modrm) & 0x07)
    diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
    index 4ffa345..5478825 100644
    --- a/arch/x86/include/asm/kprobes.h
    +++ b/arch/x86/include/asm/kprobes.h
    @@ -24,6 +24,7 @@
    #include <linux/types.h>
    #include <linux/ptrace.h>
    #include <linux/percpu.h>
    +#include <asm/insn.h>

    #define __ARCH_WANT_KPROBES_INSN_SLOT

    @@ -36,7 +37,6 @@ typedef u8 kprobe_opcode_t;
    #define RELATIVEJUMP_SIZE 5
    #define RELATIVECALL_OPCODE 0xe8
    #define RELATIVE_ADDR_SIZE 4
    -#define MAX_INSN_SIZE 16
    #define MAX_STACK_SIZE 64
    #define MIN_STACK_SIZE(ADDR) \
    (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
    diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
    index ef56f05..72453ac 100644
    --- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
    +++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
    @@ -379,8 +379,6 @@ static void intel_pmu_pebs_disable_all(void)

    #include <asm/insn.h>

    -#define MAX_INSN_SIZE 16
    -
    static inline bool kernel_ip(unsigned long ip)
    {
    #ifdef CONFIG_X86_32

    \
     
     \ /
      Last update: 2010-03-10 14:23    [W:0.023 / U:63.800 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site