aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-27 08:37:18 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-27 08:37:18 -0400
commitfdc2fefe46db79f0a19f690531cd775fbbc2740f (patch)
tree0a5761e16b7e1685e72c09862390fb96c17fd702 /sysdeps
parente57420c6c67b914abb01f7c3b1d999795121ce70 (diff)
parentea486f691d34ef2a28d06bb507ac3352e32e1f13 (diff)
downloadglibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.zip
glibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.tar.gz
glibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.tar.bz2
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog NEWS
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/bits/resource.h10
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/resource.h10
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sys/user.h2
3 files changed, 17 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h
index ca2c9f0..336c192 100644
--- a/sysdeps/unix/sysv/linux/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/bits/resource.h
@@ -1,5 +1,5 @@
/* Bit values & structures for resource limits. Linux version.
- Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010
+ Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -100,7 +100,13 @@ enum __rlimit_resource
__RLIMIT_RTPRIO = 14,
#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
- __RLIMIT_NLIMITS = 15,
+ /* Maximum CPU time in µs that a process scheduled under a real-time
+ scheduling policy may consume without making a blocking system
+ call before being forcibly descheduled. */
+ __RLIMIT_RTTIME = 15,
+#define RLIMIT_RTTIME __RLIMIT_RTTIME
+
+ __RLIMIT_NLIMITS = 16,
__RLIM_NLIMITS = __RLIMIT_NLIMITS
#define RLIMIT_NLIMITS __RLIMIT_NLIMITS
#define RLIM_NLIMITS __RLIM_NLIMITS
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
index 6e4fc97..04d33e4 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
@@ -1,5 +1,5 @@
/* Bit values & structures for resource limits. Linux/SPARC version.
- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005, 2008, 2009
+ Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -100,7 +100,13 @@ enum __rlimit_resource
__RLIMIT_RTPRIO = 14,
#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
- __RLIMIT_NLIMITS = 15,
+ /* Maximum CPU time in µs that a process scheduled under a real-time
+ scheduling policy may consume without making a blocking system
+ call before being forcibly descheduled. */
+ __RLIMIT_RTTIME = 15,
+#define RLIMIT_RTTIME __RLIMIT_RTTIME
+
+ __RLIMIT_NLIMITS = 16,
__RLIM_NLIMITS = __RLIMIT_NLIMITS
#define RLIMIT_NLIMITS __RLIMIT_NLIMITS
#define RLIM_NLIMITS __RLIM_NLIMITS
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/user.h b/sysdeps/unix/sysv/linux/x86_64/sys/user.h
index c54cca8..e4423cf 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;