Commit b2c3dda6 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull time fixes from Ingo Molnar:
 "A TIA adjtimex interface extension, and a POSIX compliance ABI fix for
  timespec64 users"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ntp: Allow TAI-UTC offset to be set to zero
  y2038: Make CONFIG_64BIT_TIME unconditional
parents c77ee64f fdc6bae9
...@@ -781,7 +781,7 @@ config COMPAT_OLD_SIGACTION ...@@ -781,7 +781,7 @@ config COMPAT_OLD_SIGACTION
bool bool
config 64BIT_TIME config 64BIT_TIME
def_bool ARCH_HAS_64BIT_TIME def_bool y
help help
This should be selected by all architectures that need to support This should be selected by all architectures that need to support
new system calls with a 64-bit time_t. This is relevant on all 32-bit new system calls with a 64-bit time_t. This is relevant on all 32-bit
......
...@@ -691,7 +691,7 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc, ...@@ -691,7 +691,7 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc,
time_constant = max(time_constant, 0l); time_constant = max(time_constant, 0l);
} }
if (txc->modes & ADJ_TAI && txc->constant > 0) if (txc->modes & ADJ_TAI && txc->constant >= 0)
*time_tai = txc->constant; *time_tai = txc->constant;
if (txc->modes & ADJ_OFFSET) if (txc->modes & ADJ_OFFSET)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment