diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
| commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
| tree | 470cce472be3b08c160e0c569648e7228651b12a /arch/mips/kernel/binfmt_elfn32.c | |
| parent | ebcff3c773b42bce6182ec16485abca4e53fba97 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/kernel/binfmt_elfn32.c')
| -rw-r--r-- | arch/mips/kernel/binfmt_elfn32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c index d8e2674a1543..4a9f1ecefaf2 100644 --- a/arch/mips/kernel/binfmt_elfn32.c +++ b/arch/mips/kernel/binfmt_elfn32.c | |||
| @@ -103,8 +103,9 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | |||
| 103 | * one divide. | 103 | * one divide. |
| 104 | */ | 104 | */ |
| 105 | u64 nsec = (u64)jiffies * TICK_NSEC; | 105 | u64 nsec = (u64)jiffies * TICK_NSEC; |
| 106 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); | 106 | long rem; |
| 107 | value->tv_usec /= NSEC_PER_USEC; | 107 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &rem); |
| 108 | value->tv_usec = rem / NSEC_PER_USEC; | ||
| 108 | } | 109 | } |
| 109 | 110 | ||
| 110 | #define ELF_CORE_EFLAGS EF_MIPS_ABI2 | 111 | #define ELF_CORE_EFLAGS EF_MIPS_ABI2 |