From 02d9e3b5141d6b33d000a5818b626561dd5ca356 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 14 May 2008 08:10:31 +0200
Subject: [PATCH] --- yaml --- r: 100543 b: refs/heads/master c:
 37135677e653537ffc6e7def679443272a1c03c3 h: refs/heads/master i:   100541:
 e64dba4b8b5a0423ea2b04a46f4005c24b75e6cb   100539:
 f45448f69f5ac335090916ff0ee17590b7d8fc79   100535:
 24d1a506072791f048c1338b3b8a903aa735379f   100527:
 7d6a6c49dc568f5976faf3e735ee13c070e83e28   100511:
 967081aeccce2bf535795822b16d108b21d57f8e   100479:
 2f8ff737a77a73b49d9bacfc405a0ed418daba00 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/i386_ksyms_32.c  |  9 ++++++++-
 trunk/arch/x86/kernel/x8664_ksyms_64.c | 11 +++++++++--
 trunk/kernel/trace/ftrace.c            |  3 ---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7e1435298c89..96c05d5616bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d05f5f9906740474eb768823004ffcd775b12ca6
+refs/heads/master: 37135677e653537ffc6e7def679443272a1c03c3
diff --git a/trunk/arch/x86/kernel/i386_ksyms_32.c b/trunk/arch/x86/kernel/i386_ksyms_32.c
index deb43785e923..29999dbb754c 100644
--- a/trunk/arch/x86/kernel/i386_ksyms_32.c
+++ b/trunk/arch/x86/kernel/i386_ksyms_32.c
@@ -1,7 +1,14 @@
+#include <linux/ftrace.h>
 #include <linux/module.h>
+
 #include <asm/checksum.h>
-#include <asm/desc.h>
 #include <asm/pgtable.h>
+#include <asm/desc.h>
+
+#ifdef CONFIG_FTRACE
+/* mcount is defined in assembly */
+EXPORT_SYMBOL(mcount);
+#endif
 
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial_copy_generic);
diff --git a/trunk/arch/x86/kernel/x8664_ksyms_64.c b/trunk/arch/x86/kernel/x8664_ksyms_64.c
index f6c05d0410fb..122885bc5f3b 100644
--- a/trunk/arch/x86/kernel/x8664_ksyms_64.c
+++ b/trunk/arch/x86/kernel/x8664_ksyms_64.c
@@ -1,15 +1,22 @@
 /* Exports for assembly files.
    All C exports should go in the respective C files. */
 
+#include <linux/ftrace.h>
 #include <linux/module.h>
-#include <net/checksum.h>
 #include <linux/smp.h>
 
+#include <net/checksum.h>
+
 #include <asm/processor.h>
-#include <asm/uaccess.h>
 #include <asm/pgtable.h>
+#include <asm/uaccess.h>
 #include <asm/desc.h>
 
+#ifdef CONFIG_FTRACE
+/* mcount is defined in assembly */
+EXPORT_SYMBOL(mcount);
+#endif
+
 EXPORT_SYMBOL(kernel_thread);
 
 EXPORT_SYMBOL(__get_user_1);
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 07b2a14943f8..a3e47f43f8a0 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -50,9 +50,6 @@ static struct ftrace_ops ftrace_list_end __read_mostly =
 static struct ftrace_ops *ftrace_list __read_mostly = &ftrace_list_end;
 ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub;
 
-/* mcount is defined per arch in assembly */
-EXPORT_SYMBOL(mcount);
-
 void ftrace_list_func(unsigned long ip, unsigned long parent_ip)
 {
 	struct ftrace_ops *op = ftrace_list;