about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-05-15 23:36:35 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-05-15 23:36:35 +0000
commit048073995fc2cdc629e11516f883e0247a23a336 (patch)
tree8632acdbf98ab87f1b03434e421b78f6e6496c3e
parenta9538892adfbb9f092e0bb14ff3a1703973968af (diff)
downloadglibc-048073995fc2cdc629e11516f883e0247a23a336.tar.gz
glibc-048073995fc2cdc629e11516f883e0247a23a336.tar.xz
glibc-048073995fc2cdc629e11516f883e0247a23a336.zip
Remove fallback definitions of __NR_set_robust_list.
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/pthreadP.h13
2 files changed, 6 insertions, 12 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index fc91c729f8..b2443edb97 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* pthreadP.h [!__NR_set_robust_list] (__NR_set_robust_list): Do
+	not define.
+
 2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (lll_lock): Load
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 24a24717fc..6427e3d2e0 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2007, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -582,15 +582,4 @@ extern void __wait_lookup_done (void) attribute_hidden;
 # define PTHREAD_STATIC_FN_REQUIRE(name) __asm (".globl " #name);
 #endif
 
-
-#ifndef __NR_set_robust_list
-/* XXX For the time being...  Once we can rely on the kernel headers
-   having the definition remove these lines.  */
-# if defined __i386__
-#  define __NR_set_robust_list  311
-# elif defined __x86_64__
-#  define __NR_set_robust_list  273
-# endif
-#endif
-
 #endif	/* pthreadP.h */