From ea486f691d34ef2a28d06bb507ac3352e32e1f13 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 25 May 2011 16:57:13 -0400 Subject: Undo accidental change in x86-64 user.h --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/x86_64/sys/user.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f65ddfb5a..299905a732 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-25 Jakub Jelinek + + * sysdeps/unix/sysv/linux/x86_64/sys/user.h + (struct user_regs_struct): Change intcs field back to cs. + 2011-05-25 Ulrich Drepper * 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; -- cgit 1.4.1