Merge branch 'upstream-merged'

1 files changed, 0 insertions, 28 deletions

diff --git a/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c b/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c
deleted file mode 100644
index a9bbd327..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_mutexattr_setprioceiling.  Generic version.
-   Copyright (C) 2002 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pthread.h>
-#include <pt-internal.h>
-
-int
-pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr,
-				  int prioceiling)
-{
-  return ENOSYS;
-}