From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from biscayne-one-station.mit.edu (BISCAYNE-ONE-STATION.MIT.EDU [18.7.7.80]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30B6FDDE1F for ; Wed, 29 Apr 2009 01:48:06 +1000 (EST) Date: Tue, 28 Apr 2009 11:47:15 -0400 (EDT) From: Tim Abbott To: Paul Mackerras Subject: Re: Please revert edada399 and 9203fc9c In-Reply-To: <18934.35969.872225.70725@cargo.ozlabs.ibm.com> Message-ID: References: <18934.35969.872225.70725@cargo.ozlabs.ibm.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Linus Torvalds , linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , > Please revert commits edada399 ("powerpc: Use TEXT_TEXT macro in > linker script.") and 9203fc9c ("powerpc: Use __REF macro instead of > old .text.init.refok."), which depends on edada399. Paul, Sorry for breaking the build. I will be sure to CC you and linuxppc-dev@ozlabs.org on future powerpc patches in this section name cleanup project. I think just reverting commits edada399 and 9203fc9c will cause a section mismatch warning since commit 27b18332 removed the support code for the .text.init.refok section. The following patch I believe should fix this by effectively reverting just commit edada399. Can someone who has a 64-bit powerpc machine confirm? -Tim Abbott -- powerpc: Revert switch to TEXT_TEXT in linker script Commit edada399 broke the build on 64-bit powerpc because it moved the __ftr_alt_* sections of a file away from the .text section, causing link failures due to relative conditional branch targets being too far away from the branch instructions. This happens on pretty much all 64-bit powerpc configs. This change reverts commit edada399 while preserving the update from the *.refok sections to .ref.text that has happened since. Signed-off-by: Tim Abbott --- arch/powerpc/kernel/vmlinux.lds.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 433ae11..a047a6c 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -54,8 +54,8 @@ SECTIONS ALIGN_FUNCTION(); HEAD_TEXT _text = .; - TEXT_TEXT - *(.fixup __ftr_alt_*) + /* careful! __ftr_alt_* sections need to be close to .text */ + *(.text .fixup __ftr_alt_* .ref.text) SCHED_TEXT LOCK_TEXT KPROBES_TEXT -- 1.6.2.1