Remove fallback definitions of __NR_set_robust_list.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index fc91c72..b2443ed 100644 (file)
--- 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 24a2471..6427e3d 100644 (file)
--- 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 */