From d3fe4b8acb5dd455789c0b001d00bd5dc75d83cd Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Sun, 6 Dec 2009 20:14:29 +0900 Subject: [PATCH] --- yaml --- r: 175409 b: refs/heads/master c: cbe5c34c8c1f8ed1afbe6273f4ad57fcfad7822f h: refs/heads/master i: 175407: 42de3193b8a0732fc6fc7b08f2d2d15e37b86e8e v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig.debug | 4 ++-- trunk/arch/x86/lib/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b1e0bf6ca961..ddbfcd17ef1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 180570fdb7a3c404b599f0a318c2ccf86e4827ed +refs/heads/master: cbe5c34c8c1f8ed1afbe6273f4ad57fcfad7822f diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug index 7d0b681a132b..0e90929da40f 100644 --- a/trunk/arch/x86/Kconfig.debug +++ b/trunk/arch/x86/Kconfig.debug @@ -187,8 +187,8 @@ config HAVE_MMIOTRACE_SUPPORT def_bool y config X86_DECODER_SELFTEST - bool "x86 instruction decoder selftest" - depends on DEBUG_KERNEL + bool "x86 instruction decoder selftest" + depends on DEBUG_KERNEL && KPROBES ---help--- Perform x86 instruction decoder selftests at build time. This option is useful for checking the sanity of x86 instruction diff --git a/trunk/arch/x86/lib/Makefile b/trunk/arch/x86/lib/Makefile index a2d6472895fb..442b3b3b2d80 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-y += insn.o inat.o +lib-$(CONFIG_KPROBES) += insn.o inat.o obj-y += msr-reg.o msr-reg-export.o