From 1abcfa34aea124098c76d416bfc4c7e0f2cf5ad5 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 1 Jul 2008 17:35:06 +0200 Subject: [PATCH] --- yaml --- r: 100587 b: refs/heads/master c: 760378e1497841246ea7e42abad617d8a8ac0bcc h: refs/heads/master i: 100585: 9108b57bd648dc04c5549d1fe4ccad10abce3598 100583: a6542a27410a1d4e5190771f112bc35d43194a96 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/sparc64_ksyms.c | 2 +- trunk/include/asm-sparc64/ftrace.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 89568588f4da..902d23d4a8f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e61e0c976532a542b23bbb74c8f631815171078 +refs/heads/master: 760378e1497841246ea7e42abad617d8a8ac0bcc diff --git a/trunk/arch/sparc64/kernel/sparc64_ksyms.c b/trunk/arch/sparc64/kernel/sparc64_ksyms.c index b80d982a29c6..49d3ea50c247 100644 --- a/trunk/arch/sparc64/kernel/sparc64_ksyms.c +++ b/trunk/arch/sparc64/kernel/sparc64_ksyms.c @@ -112,7 +112,7 @@ EXPORT_SYMBOL(__write_trylock); EXPORT_SYMBOL(smp_call_function); #endif /* CONFIG_SMP */ -#if defined(CONFIG_MCOUNT) +#ifdef CONFIG_MCOUNT EXPORT_SYMBOL(_mcount); #endif diff --git a/trunk/include/asm-sparc64/ftrace.h b/trunk/include/asm-sparc64/ftrace.h index f76a40a338bb..d27716cd38c1 100644 --- a/trunk/include/asm-sparc64/ftrace.h +++ b/trunk/include/asm-sparc64/ftrace.h @@ -1,7 +1,7 @@ #ifndef _ASM_SPARC64_FTRACE #define _ASM_SPARC64_FTRACE -#ifdef CONFIG_FTRACE +#ifdef CONFIG_MCOUNT #define MCOUNT_ADDR ((long)(_mcount)) #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */