From f574184a0e4b6ed69a5d9a3234543fba6d2a7367 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Wed, 11 May 2011 23:58:02 -0400
Subject: [PATCH] Fix sched_setscheduler call in spawn implementation

---
 ChangeLog              | 3 +++
 NEWS                   | 8 ++++----
 sysdeps/posix/spawni.c | 4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2697af9ed9..e4e7ad887c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-11  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #12052]
+	* sysdeps/posix/spawni.c (__spawni): Fix sched_setscheduler call.
+
 	[BZ #12625]
 	* misc/mntent_r.c (addmntent): Flush the stream after the output
 
diff --git a/NEWS b/NEWS
index 54822a4c72..2155de1d7b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,10 +10,10 @@ Version 2.14
 * The following bugs are resolved with this release:
 
   386, 11257, 11258, 11487, 11532, 11578, 11653, 11668, 11724, 11945, 11947,
-  12158, 12178, 12200, 12346, 12393, 12420, 12445, 12449, 12454, 12460,
-  12469, 12489, 12509, 12510, 12518, 12527, 12541, 12545, 12551, 12583,
-  12587, 12597, 12611, 12625, 12631, 12650, 12653, 12655, 12660, 12681,
-  12685, 12711, 12713, 12714, 12717, 12723, 12734, 12738
+  12052, 12158, 12178, 12200, 12346, 12393, 12420, 12445, 12449, 12454,
+  12460, 12469, 12489, 12509, 12510, 12518, 12527, 12541, 12545, 12551,
+  12583, 12587, 12597, 12611, 12625, 12631, 12650, 12653, 12655, 12660,
+  12681, 12685, 12711, 12713, 12714, 12717, 12723, 12734, 12738
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.
diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c
index c5a827d6d7..f19862ffff 100644
--- a/sysdeps/posix/spawni.c
+++ b/sysdeps/posix/spawni.c
@@ -143,9 +143,7 @@ __spawni (pid_t *pid, const char *file,
     }
   else if ((flags & POSIX_SPAWN_SETSCHEDULER) != 0)
     {
-      if (__sched_setscheduler (0, attrp->__policy,
-				(flags & POSIX_SPAWN_SETSCHEDPARAM) != 0
-				? &attrp->__sp : NULL) == -1)
+      if (__sched_setscheduler (0, attrp->__policy, &attrp->__sp) == -1)
 	_exit (SPAWN_ERROR);
     }
 #endif