From: Chris Wright Date: Tue, 27 Jun 2006 18:54:56 +0000 (-0700) Subject: build (link) fix for ppc64 when futexes are disabled, fwd from akpm X-Git-Tag: v2.6.17.2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fb6f151eb3e38206cea024c4c4290bf5cbc2340;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..ef26dc43dea --- /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 + +If futexes are disabled we fail to link on ppc64. + +Signed-off-by: Anton Blanchard +Cc: +Signed-off-by: Andrew Morton +--- + + 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 0906124d2a3..5a3c3981e9c 100644 --- 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