From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 25 May 2011 20:57:13 +0000 (-0400)
Subject: Undo accidental change in x86-64 user.h
X-Git-Tag: glibc-2.14~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea486f691d34ef2a28d06bb507ac3352e32e1f13;p=thirdparty%2Fglibc.git

Undo accidental change in x86-64 user.h
---

diff --git a/ChangeLog b/ChangeLog
index 8f65ddfb5a9..299905a7326 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* 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@gmail.com>
 
 	* po/ja.po: Update from translation team.
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/user.h b/sysdeps/unix/sysv/linux/x86_64/sys/user.h
index c54cca80adc..e4423cf4377 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sys/user.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sys/user.h
@@ -61,7 +61,7 @@ struct user_regs_struct
   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;