diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/adjtime.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/sched.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-sysdep.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/sys/user.h | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c index 202bb14485..ebd2149705 100644 --- a/sysdeps/unix/sysv/linux/adjtime.c +++ b/sysdeps/unix/sysv/linux/adjtime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007 +/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -71,14 +71,16 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv) return -1; } tntx.offset = tmp.tv_usec + tmp.tv_sec * 1000000L; + tntx.modes = ADJ_OFFSET_SINGLESHOT; + } + else + { #ifdef ADJ_OFFSET_SS_READ tntx.modes = ADJ_OFFSET_SS_READ; #else - tntx.modes = ADJ_OFFSET_SINGLESHOT; + tntx.modes = 0; #endif } - else - tntx.modes = 0; #if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ again: diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h index 5387b9cef0..38ba305006 100644 --- a/sysdeps/unix/sysv/linux/bits/sched.h +++ b/sysdeps/unix/sysv/linux/bits/sched.h @@ -59,7 +59,12 @@ force CLONE_PTRACE on this clone. */ # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in the child. */ -# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */ +# define CLONE_NEWUTS 0x04000000 /* New utsname group. */ +# define CLONE_NEWIPC 0x08000000 /* New ipcs. */ +# define CLONE_NEWUSER 0x10000000 /* New user namespace. */ +# define CLONE_NEWPID 0x20000000 /* New pid namespace. */ +# define CLONE_NEWNET 0x40000000 /* New network namespace. */ +# define CLONE_IO 0x80000000 /* Clone I/O context. */ #endif /* The official definition. */ diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.h b/sysdeps/unix/sysv/linux/dl-sysdep.h index 0371fe87a1..f44fa9814e 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.h +++ b/sysdeps/unix/sysv/linux/dl-sysdep.h @@ -29,7 +29,7 @@ /* The _dl_discover_osversion function is so far only needed in sysconf to check for kernels later than 2.6.23. */ -#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617 +#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617 /* Get version of the OS. */ extern int _dl_discover_osversion (void) attribute_hidden; # define HAVE_DL_DISCOVER_OSVERSION 1 diff --git a/sysdeps/unix/sysv/linux/s390/sys/user.h b/sysdeps/unix/sysv/linux/s390/sys/user.h index f00caea84d..cd3e60cf0d 100644 --- a/sysdeps/unix/sysv/linux/s390/sys/user.h +++ b/sysdeps/unix/sysv/linux/s390/sys/user.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000,2005 Free Software Foundation, Inc. +/* Copyright (C) 2000,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -56,7 +56,7 @@ struct _user_regs_struct unsigned long orig_gpr2; /* Original gpr2. */ struct _user_fpregs_struct fp_regs; /* Floating point registers. */ struct _user_per_struct per_info; /* Hardware tracing registers. */ - unsigned long ieee_instruction_pointer; + unsigned long ieee_instruction_pointer; /* Always 0. */ }; struct user { |