1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 985e3b33e06..f3ab7f9b990 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2014-07-31  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Simplify timerfd configuration and fix some minor glitches.
+        * atimer.c (TIMERFD_CREATE_FLAGS): Remove; we now assume TFD_CLOEXEC.
+        (alarm_timer, alarm_timer_ok, set_alarm, init_atimer):
+        Fall back on timer_create if timerfd_create fails at runtime.
+        (resolution) [HAVE_CLOCK_GETRES]: Remove; we now rely on the
+        kernel primitives to do resolution.  All uses removed.
+        (timerfd) [!HAVE_TIMERFD]: Define to be -1, for convenience.
+        (turn_on_atimers): Clear timer_create-based timers too,
+        for consistency.
+
         * frame.c (x_set_frame_parameters): Don't use uninitialized locals.
         Without this change, the code can access the local variable 'width'
         even when it has not been initialized, and likewise for 'height';