From: Nick Alcock <nick.alcock@oracle.com>
Date: Tue, 28 Jun 2011 13:15:18 +0000 (+0100)
Subject: dtrace: build sdt_register.c into the kernel
X-Git-Tag: v4.1.12-92~313^2~181
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b123f06deff2680ba6cecc147fdb67248c5bc8f3;p=users%2Fjedix%2Flinux-maple.git

dtrace: build sdt_register.c into the kernel

This allows DTrace to be built as a module again.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---

diff --git a/kernel/dtrace/Makefile b/kernel/dtrace/Makefile
index 99feb0606718..5f64b0923452 100644
--- a/kernel/dtrace/Makefile
+++ b/kernel/dtrace/Makefile
@@ -7,11 +7,11 @@ obj-$(CONFIG_DT_FASTTRAP)	+= fasttrap.o
 obj-$(CONFIG_DT_FBT)		+= fbt.o
 obj-$(CONFIG_DT_LOCKSTAT)	+= lockstat.o
 obj-$(CONFIG_DT_PROFILE)	+= profile.o
-obj-$(CONFIG_DT_SDT)		+= sdt.o sdt_register.o
+obj-$(CONFIG_DT_SDT)		+= sdt.o
 obj-$(CONFIG_DT_SYSTRACE)	+= systrace.o
 
 ifdef CONFIG_DT_CORE
-obj-y				+= dtrace_os.o
+obj-y				+= dtrace_os.o sdt_register.o
 endif
 
 dtrace-y			:= dtrace_mod.o dtrace_dev.o \