瀏覽代碼

[MIPS] jiffies_to_compat_timeval fix

The last argument of div_long_long_rem() must be long.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Atsushi Nemoto 19 年之前
父節點
當前提交
909fa64c8b
共有 2 個文件被更改,包括 6 次插入4 次删除
  1. 3 2
      arch/mips/kernel/binfmt_elfn32.c
  2. 3 2
      arch/mips/kernel/binfmt_elfo32.c

+ 3 - 2
arch/mips/kernel/binfmt_elfn32.c

@@ -103,8 +103,9 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
 	 * one divide.
 	 * one divide.
 	 */
 	 */
 	u64 nsec = (u64)jiffies * TICK_NSEC;
 	u64 nsec = (u64)jiffies * TICK_NSEC;
-	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec);
-	value->tv_usec /= NSEC_PER_USEC;
+	long rem;
+	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &rem);
+	value->tv_usec = rem / NSEC_PER_USEC;
 }
 }
 
 
 #define ELF_CORE_EFLAGS EF_MIPS_ABI2
 #define ELF_CORE_EFLAGS EF_MIPS_ABI2

+ 3 - 2
arch/mips/kernel/binfmt_elfo32.c

@@ -105,8 +105,9 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
 	 * one divide.
 	 * one divide.
 	 */
 	 */
 	u64 nsec = (u64)jiffies * TICK_NSEC;
 	u64 nsec = (u64)jiffies * TICK_NSEC;
-	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec);
-	value->tv_usec /= NSEC_PER_USEC;
+	long rem;
+	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &rem);
+	value->tv_usec = rem / NSEC_PER_USEC;
 }
 }
 
 
 #undef ELF_CORE_COPY_REGS
 #undef ELF_CORE_COPY_REGS