From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 28 Dec 2009 08:23:13 +0000 (+0100)
Subject: Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... 
X-Git-Tag: v3.0~6183^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=605c1a187f3ce82fbc243e2163c5ca8d1926df8e;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'iommu/fixes' of git://git./linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
---

605c1a187f3ce82fbc243e2163c5ca8d1926df8e
diff --cc arch/x86/lib/Makefile
index 706be8bf,45b20e4..cffd754f
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@@ -20,9 -20,9 +20,9 @@@ lib-y := delay.
  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
 +obj-y += msr.o msr-reg.o msr-reg-export.o
  
  ifeq ($(CONFIG_X86_32),y)
          obj-y += atomic64_32.o