summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@nsn.com>2014-10-17 18:10:24 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-06 15:55:32 -0800
commit32472d9c79af7654775afd424e67779291fc9868 (patch)
tree1c81be6868e870b13dc347558e09456e40412a77 /arch/mips
parent2dc2565902d3c24108c4b7101e91957fd068a242 (diff)
downloadlinux-stable-32472d9c79af7654775afd424e67779291fc9868.tar.gz
linux-stable-32472d9c79af7654775afd424e67779291fc9868.tar.bz2
linux-stable-32472d9c79af7654775afd424e67779291fc9868.zip
MIPS: oprofile: Fix backtrace on 64-bit kernel
commit bbaf113a481b6ce32444c125807ad3618643ce57 upstream. Fix incorrect cast that always results in wrong address for the new frame on 64-bit kernels. Signed-off-by: Aaro Koskinen <aaro.koskinen@nsn.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/8110/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/oprofile/backtrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/oprofile/backtrace.c b/arch/mips/oprofile/backtrace.c
index 6854ed5097d2..83a1dfd8f0e3 100644
--- a/arch/mips/oprofile/backtrace.c
+++ b/arch/mips/oprofile/backtrace.c
@@ -92,7 +92,7 @@ static inline int unwind_user_frame(struct stackframe *old_frame,
/* This marks the end of the previous function,
which means we overran. */
break;
- stack_size = (unsigned) stack_adjustment;
+ stack_size = (unsigned long) stack_adjustment;
} else if (is_ra_save_ins(&ip)) {
int ra_slot = ip.i_format.simmediate;
if (ra_slot < 0)