[PATCH 22/25] Link error when futexes are disabled on 64bit architectures

Chris Wright
2006-06-27T20:19:56Z

[-- Attachment #1: link-error-when-futexes-are-disabled-on-64bit-architectures.patch --]
[-- Type: text/plain, Size: 788 bytes --]

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Anton Blanchard <anton@samba.org>

If futexes are disabled we fail to link on ppc64.

Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

kernel/exit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.17.1.orig/kernel/exit.c
+++ linux-2.6.17.1/kernel/exit.c
@@ -899,7 +899,7 @@ fastcall NORET_TYPE void do_exit(long co
}
if (unlikely(tsk->robust_list))
exit_robust_list(tsk);
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_FUTEX) && defined(CONFIG_COMPAT)
if (unlikely(tsk->compat_robust_list))
compat_exit_robust_list(tsk);
#endif

--