diff options
author | Tejun Heo <tj@kernel.org> | 2014-11-22 09:32:08 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-11-22 09:32:08 -0500 |
commit | cceb9bd63373061ad7b75c321808a2fb11c86545 (patch) | |
tree | a70d939eabed2e19538707402441644dfc26990e /arch/mips/oprofile | |
parent | 56e4dea81a55c338eede625f715c7fa21f1a28c4 (diff) | |
parent | 8a84e01e147f44111988f9d8ccd2eaa30215a0f2 (diff) | |
download | op-kernel-dev-cceb9bd63373061ad7b75c321808a2fb11c86545.zip op-kernel-dev-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.gz |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/mips/oprofile')
-rw-r--r-- | arch/mips/oprofile/backtrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/oprofile/backtrace.c b/arch/mips/oprofile/backtrace.c index 6854ed5..83a1dfd 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) |