From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Fri, 20 May 2011 00:36:06 +0000 (-0400)
Subject: dtrace: Fix compilation when modular.
X-Git-Tag: v4.1.12-92~313^2~192
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3e60e3f59e36fb63e922c2f9ec03bebbd5ac1f08;p=users%2Fjedix%2Flinux-maple.git

dtrace: Fix compilation when modular.

Removed || CONFIG_DT_SDT_MODULE from conditional surrounding call to
dtrace_register_builtins() because that function does not exist in the
kernel proper when DTrace is compiled as kernel modules.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---

diff --git a/init/main.c b/init/main.c
index da860d2f58c8..bddbc47e9455 100644
--- a/init/main.c
+++ b/init/main.c
@@ -674,7 +674,7 @@ asmlinkage __visible void __init start_kernel(void)
 
 	ftrace_init();
 
-#if defined(CONFIG_DT_SDT) || defined(CONFIG_DT_SDT_MODULE)
+#if defined(CONFIG_DT_SDT)
 	dtrace_register_builtins();
 #endif