diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-11-25 15:43:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 15:43:15 +0100 |
| commit | 83bae01182ea755280adc1c3a24032d63a614ede (patch) | |
| tree | f05249057a392e750c0622bbdd3620e19aafd031 /kernel/time/time.c | |
| parent | time: Rename tsk->real_start_time to ->start_boottime (diff) | |
| parent | time: Zero the upper 32-bits in __kernel_timespec on 32-bit (diff) | |
| download | wireguard-linux-83bae01182ea755280adc1c3a24032d63a614ede.tar.xz wireguard-linux-83bae01182ea755280adc1c3a24032d63a614ede.zip | |
Merge branch 'timers/urgent' into timers/core, to pick up fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/time.c')
| -rw-r--r-- | kernel/time/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time/time.c b/kernel/time/time.c index ea6e7e47cc37..4d434dad6ebc 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -884,7 +884,8 @@ int get_timespec64(struct timespec64 *ts, ts->tv_sec = kts.tv_sec; /* Zero out the padding for 32 bit systems or in compat mode */ - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) + if (IS_ENABLED(CONFIG_64BIT_TIME) && (!IS_ENABLED(CONFIG_64BIT) || + in_compat_syscall())) kts.tv_nsec &= 0xFFFFFFFFUL; ts->tv_nsec = kts.tv_nsec; |