Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / s390 / include / asm / ftrace.h

diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
index 3c29be4..b7931fa 100644 (file)
--- a/arch/s390/include/asm/ftrace.h
+++ b/arch/s390/include/asm/ftrace.h
@@ -11,15 +11,13 @@ struct dyn_arch_ftrace { };
 
 #ifdef CONFIG_64BIT
 #define MCOUNT_INSN_SIZE  12
-#define MCOUNT_OFFSET     8
 #else
 #define MCOUNT_INSN_SIZE  20
-#define MCOUNT_OFFSET     4
 #endif
 
 static inline unsigned long ftrace_call_adjust(unsigned long addr)
 {
-       return addr - MCOUNT_OFFSET;
+       return addr;
 }
 
 #endif /* __ASSEMBLY__ */