Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754505Ab0ALQ1M (ORCPT ); Tue, 12 Jan 2010 11:27:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754490Ab0ALQ1I (ORCPT ); Tue, 12 Jan 2010 11:27:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15553 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754479Ab0ALQ1G (ORCPT ); Tue, 12 Jan 2010 11:27:06 -0500 Date: Tue, 12 Jan 2010 11:26:31 -0500 From: Jason Baron To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, mathieu.desnoyers@polymtl.ca, hpa@zytor.com, tglx@linutronix.de, rostedt@goodmis.org, andi@firstfloor.org, roland@redhat.com, rth@redhat.com, mhiramat@redhat.com Message-Id: <78fc1df24fa5d493b9b913222c90f19fa83cdb20.1263247114.git.jbaron@redhat.com> In-Reply-To: References: Subject: [RFC PATCH 3/8] jump label v4 - move opcode definitions Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1759 Lines: 48 Move x86 opcode macros from arch/x86/include/asm/kprobes.h to arch/x86/include/asm/alternative.h so they are useful outside of kprobes. Signed-off-by: Jason Baron --- arch/x86/include/asm/alternative.h | 5 +++++ arch/x86/include/asm/kprobes.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 9b856b7..7a7d457 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -166,6 +166,11 @@ static inline void apply_paravirt(struct paravirt_patch_site *start, */ extern void *text_poke(void *addr, const void *opcode, size_t len); +#define BREAKPOINT_INSTRUCTION 0xcc +#define RELATIVEJUMP_OPCODE 0xe9 +#define RELATIVEJUMP_SIZE 5 +#define MAX_INSN_SIZE 16 + /* * Setup int3 trap and fixup execution for cross-modifying on SMP case. * If the other cpus execute modifying instruction, it will hit int3 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h index febab97..15b1b12 100644 --- a/arch/x86/include/asm/kprobes.h +++ b/arch/x86/include/asm/kprobes.h @@ -31,10 +31,6 @@ struct pt_regs; struct kprobe; typedef u8 kprobe_opcode_t; -#define BREAKPOINT_INSTRUCTION 0xcc -#define RELATIVEJUMP_OPCODE 0xe9 -#define RELATIVEJUMP_SIZE 5 -#define MAX_INSN_SIZE 16 #define MAX_STACK_SIZE 64 #define MIN_STACK_SIZE(ADDR) \ (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ -- 1.6.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/