build (link) fix for ppc64 when futexes are disabled, fwd from akpm

diff --git a/queue-2.6.17/link-error-when-futexes-are-disabled-on-64bit-architectures.patch b/queue-2.6.17/link-error-when-futexes-are-disabled-on-64bit-architectures.patch
new file mode 100644 (file)
index 0000000..ef26dc4
--- /dev/null
+++ b/queue-2.6.17/link-error-when-futexes-are-disabled-on-64bit-architectures.patch
@@ -0,0 +1,31 @@
+From stable-bounces@linux.kernel.org  Sun Jun 25 05:50:21 2006
+Date: Sun, 25 Jun 2006 05:48:44 -0700
+From: akpm@osdl.org
+To: torvalds@osdl.org
+Cc: anton@samba.org, stable@kernel.org
+Subject: [stable] [patch 141/207] Link error when futexes are disabled on      64bit architectures
+
+
+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>
+---
+
+ 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

diff --git a/queue-2.6.17/series b/queue-2.6.17/series
index 0906124d2a3c5e8a8c0b652210de6abf26bfe2ec..5a3c3981e9cf56abe5c5a57e14429b83e64853c4 100644 (file)
--- a/queue-2.6.17/series
+++ b/queue-2.6.17/series
@@ -19,3 +19,4 @@ ohci1394-fix-broken-suspend-resume-in-ohci1394.patch
 libata-minor-patch-for-ata_dflag_pio.patch
 ide-io-increase-timeout-value-to-allow-for-slave-wakeup.patch
 kbuild-fix-100-initramfs-bloat-in-2.6.17-versus-2.6.16.patch
+link-error-when-futexes-are-disabled-on-64bit-architectures.patch