diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-06 19:17:24 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-06 19:17:24 +0300 |
| commit | dd63af108f0814f0b589659f4e55a7a5af3b7e53 (patch) | |
| tree | 0a7679fecb5b516cddb2153c632a4262899be6c3 /arch/mips/oprofile/backtrace.c | |
| parent | 50d1e7d1077b276e8faa9eebf8b710edf31fdeea (diff) | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| download | linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.tar.xz | |
Merge 3.18-rc7 into tty-next
This resolves the merge issue with drivers/tty/serial/of_serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/oprofile/backtrace.c')
| -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 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) |