From 6a4f288cf52ab35a1385234dd46b239a50c71f05 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 4 Mar 2010 13:49:21 +0100
Subject: [PATCH] --- yaml --- r: 191055 b: refs/heads/master c:
 30a813ae035d3e220a89609adce878e045c49547 h: refs/heads/master i:   191053:
 97f02b3a576dc7a3708c1895275a9d079befe550   191051:
 ed33727edc4b08f0b6ffa171b3d00fa3fd60d9ed   191047:
 7d7d51256a8169a30f5568807772e0206c29786a   191039:
 fc0de9ed1a03bf0173d50ad277abee1aed5d236a v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/x86/include/asm/insn.h               | 2 ++
 trunk/arch/x86/include/asm/kprobes.h            | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 96300876b437..ed6ad8d28b50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e1a40dda619b0483fbe0740494ed2c2a1f05289
+refs/heads/master: 30a813ae035d3e220a89609adce878e045c49547
diff --git a/trunk/arch/x86/include/asm/insn.h b/trunk/arch/x86/include/asm/insn.h
index 96c2e0ad04ca..88c765e16410 100644
--- a/trunk/arch/x86/include/asm/insn.h
+++ b/trunk/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/trunk/arch/x86/include/asm/kprobes.h b/trunk/arch/x86/include/asm/kprobes.h
index 4ffa345a8ccb..547882539157 100644
--- a/trunk/arch/x86/include/asm/kprobes.h
+++ b/trunk/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/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c b/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c
index ef56f053ab31..72453ac5fb7d 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/trunk/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