summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-01 17:35:06 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-01 17:46:14 +0200
commit760378e1497841246ea7e42abad617d8a8ac0bcc (patch)
tree99c038dc5c040635c40e761a73eff2605e569eed /include
parent3e61e0c976532a542b23bbb74c8f631815171078 (diff)
downloadblackbird-op-linux-760378e1497841246ea7e42abad617d8a8ac0bcc.tar.gz
blackbird-op-linux-760378e1497841246ea7e42abad617d8a8ac0bcc.zip
fix "ftrace: store mcount address in rec->ip"
Alexander Beregalov reported this build failure: $ make CROSS_COMPILE=sparc64-unknown-linux-gnu- image modules && sudo make modules_install CHK include/linux/version.h CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h dnsdomainname: Unknown host CC arch/sparc64/kernel/sparc64_ksyms.o arch/sparc64/kernel/sparc64_ksyms.c:116: error: '_mcount' undeclared here (not in a function) cc1: warnings being treated as errors arch/sparc64/kernel/sparc64_ksyms.c:116: error: type defaults to 'int' in declaration of '_mcount' And bisected it back to: | commit 395a59d0f8e86bb39cd700c3d185d30c670bb958 | Author: Abhishek Sagar <sagar.abhishek@gmail.com> | Date: Sat Jun 21 23:47:27 2008 +0530 | | ftrace: store mcount address in rec->ip the mcount prototype is only available under CONFIG_FTRACE, extend it to CONFIG_MCOUNT as well. Reported-and-bisected-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/ftrace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/ftrace.h b/include/asm-sparc64/ftrace.h
index f76a40a338bb..d27716cd38c1 100644
--- a/include/asm-sparc64/ftrace.h
+++ b/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 */
OpenPOWER on IntegriCloud