diff options
author | Jakub Jelinek <jakub@redhat.com> | 2011-05-25 16:57:13 -0400 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2011-05-25 16:57:13 -0400 |
commit | ea486f691d34ef2a28d06bb507ac3352e32e1f13 (patch) | |
tree | 12855c5fe07d0a881ffaa62f1a5be94170a841d4 | |
parent | 6f038433956851ac8f43501825c02be8a5249d0b (diff) | |
download | glibc-ea486f691d34ef2a28d06bb507ac3352e32e1f13.tar.gz glibc-ea486f691d34ef2a28d06bb507ac3352e32e1f13.tar.xz glibc-ea486f691d34ef2a28d06bb507ac3352e32e1f13.zip |
Undo accidental change in x86-64 user.h
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/sys/user.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 8f65ddfb5a..299905a732 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 c54cca80ad..e4423cf437 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; |