summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm/ftrace.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-05-17 08:17:59 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2016-05-17 08:17:59 +0200
commit0e0162bb8c008fa7742f69d4d4982c8a37b88f95 (patch)
tree4b230ab63b5698a44d2948e70a6cc22405c351e9 /arch/parisc/include/asm/ftrace.h
parentext4: switch to ->iterate_shared() (diff)
parentovl: ignore permissions on underlying lookup (diff)
downloadlinux-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.tar.xz
linux-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.zip
Merge branch 'ovl-fixes' into for-linus
Backmerge to resolve a conflict in ovl_lookup_real(); "ovl_lookup_real(): use lookup_one_len_unlocked()" instead, but it was too late in the cycle to rebase.
Diffstat (limited to 'arch/parisc/include/asm/ftrace.h')
-rw-r--r--arch/parisc/include/asm/ftrace.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h
index 544ed8ef87eb..24cd81d58d70 100644
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
@@ -4,23 +4,7 @@
#ifndef __ASSEMBLY__
extern void mcount(void);
-/*
- * Stack of return addresses for functions of a thread.
- * Used in struct thread_info
- */
-struct ftrace_ret_stack {
- unsigned long ret;
- unsigned long func;
- unsigned long long calltime;
-};
-
-/*
- * Primary handler of a function return.
- * It relays on ftrace_return_to_handler.
- * Defined in entry.S
- */
-extern void return_to_handler(void);
-
+#define MCOUNT_INSN_SIZE 4
extern unsigned long return_address(unsigned int);