diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3c9804b28..7079baa55 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-11  Ken Brown  <kbrown@cornell.edu>
+
+	* fhandler_disk_file.cc (fhandler_base::fstat_helper): Align
+	regparm attribute to declaration in fhandler.h.
+
 2015-12-10  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.h (class path_conv_handle): Use FILE_ALL_INFORMATION instead of
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index fe9dd03fc..1dd1b8cbf 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -428,7 +428,7 @@ fhandler_base::fstat_fs (struct stat *buf)
   return res;
 }
 
-int __reg3
+int __reg2
 fhandler_base::fstat_helper (struct stat *buf)
 {
   IO_STATUS_BLOCK st;