=== modified file 'src/atimer.c'
--- src/atimer.c	2014-07-28 06:28:15 +0000
+++ src/atimer.c	2014-07-28 12:00:35 +0000
@@ -413,6 +413,10 @@
 void
 timerfd_callback (int fd, void *arg)
 {
+  char buf[8];
+  ptrdiff_t nbytes = emacs_read (fd, buf, sizeof (buf));
+  /* Just discard an expiration count for now.  */
+  eassert (nbytes == sizeof (buf));
   do_pending_atimers ();
 }
 

=== modified file 'src/process.c'
--- src/process.c	2014-07-28 06:28:15 +0000
+++ src/process.c	2014-07-28 11:48:51 +0000
@@ -6835,7 +6835,9 @@
 void
 add_timer_wait_descriptor (int fd)
 {
+  FD_SET (fd, &input_wait_mask);
   FD_SET (fd, &non_keyboard_wait_mask);
+  FD_SET (fd, &non_process_wait_mask);  
   fd_callback_info[fd].func = timerfd_callback;
   fd_callback_info[fd].data = NULL;
   fd_callback_info[fd].condition |= FOR_READ;