From 2264c1382821726e0236a05edafd617216fe7fdc Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 6 Jun 2009 13:58:12 +0200
Subject: [PATCH] --- yaml --- r: 191071 b: refs/heads/master c:
 ba7e4d13fc7e25af1d167d40e6f028298dfc55ad h: refs/heads/master i:   191069:
 d7c845ebbe68e585ee793e5c5215c2eb41490ec6   191067:
 c44671fac3bfb58cf9d0a759c1d4957d03af7d75   191063:
 b7f6ca0e0be7e4d3451ec053cc8edb05969a6e43   191055:
 6a4f288cf52ab35a1385234dd46b239a50c71f05   191039:
 fc0de9ed1a03bf0173d50ad277abee1aed5d236a v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/Kconfig      | 3 +++
 trunk/arch/x86/lib/Makefile | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8e09a42042fd..a0872c8b9580 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63fb3f9b2312e131be5a0a2dddb63f2fb123db9b
+refs/heads/master: ba7e4d13fc7e25af1d167d40e6f028298dfc55ad
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index e98440371525..e1240f652a9b 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -58,6 +58,9 @@ config X86
 	select HAVE_ARCH_KMEMCHECK
 	select HAVE_USER_RETURN_NOTIFIER
 
+config INSTRUCTION_DECODER
+	def_bool (KPROBES || PERF_EVENTS)
+
 config OUTPUT_FORMAT
 	string
 	default "elf32-i386" if X86_32
diff --git a/trunk/arch/x86/lib/Makefile b/trunk/arch/x86/lib/Makefile
index 419386c24b82..cbaf8f2b83df 100644
--- a/trunk/arch/x86/lib/Makefile
+++ b/trunk/arch/x86/lib/Makefile
@@ -20,7 +20,7 @@ lib-y := delay.o
 lib-y += thunk_$(BITS).o
 lib-y += usercopy_$(BITS).o getuser.o putuser.o
 lib-y += memcpy_$(BITS).o
-lib-$(CONFIG_KPROBES) += insn.o inat.o
+lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o
 
 obj-y += msr.o msr-reg.o msr-reg-export.o