[commits] r13985 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/x86_64/sys/user.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu May 26 00:03:11 2011
New Revision: 13985

Log:
Import glibc-mainline for 2011-05-26

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu May 26 00:03:11 2011
@@ -1,3 +1,8 @@
+2011-05-25  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/x86_64/sys/user.h
+	(struct user_regs_struct): Change intcs field back to cs.
+
 2011-05-25  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* po/ja.po: Update from translation team.

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h Thu May 26 00:03:11 2011
@@ -61,7 +61,7 @@
   unsigned long int rdi;
   unsigned long int orig_rax;
   unsigned long int rip;
-  unsigned long int intcs;
+  unsigned long int cs;
   unsigned long int eflags;
   unsigned long int rsp;
   unsigned long int ss;