From patchwork Mon Jun 22 02:46:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 28968 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2471FB71BA for ; Mon, 22 Jun 2009 12:46:28 +1000 (EST) Received: by ozlabs.org (Postfix) id 16577DDDA0; Mon, 22 Jun 2009 12:46:28 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 96776DDD0C for ; Mon, 22 Jun 2009 12:46:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751661AbZFVCqX (ORCPT ); Sun, 21 Jun 2009 22:46:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753090AbZFVCqX (ORCPT ); Sun, 21 Jun 2009 22:46:23 -0400 Received: from mail-px0-f202.google.com ([209.85.216.202]:48212 "EHLO mail-px0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbZFVCqW (ORCPT ); Sun, 21 Jun 2009 22:46:22 -0400 Received: by mail-px0-f202.google.com with SMTP id 40so1108034pxi.33 for ; Sun, 21 Jun 2009 19:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=RA1H2AUKlJnhbxq+ltEvs4diG/XoJ1bJmGVsQeMjC90=; b=ctezahJkt+WQm/XAL7iDn1Qrym0QR/EPyX75QCygWwlTm4POceZoz1PpvMxpkaHN5J /aaMPpG7tTUyDIX5DIILJndcHw2evaei8QYfJUxEerUEF35vWnXXVAqnUbHJ9o2BefCK gGI0xKP6uaoVkVrF/1NdQDplNsN3rcNE/PHS0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=PaaBLWF/42Pec4wPkFsFbxbEkb8GkxGhDR0qG8oop7xszTad7uPVHB3UB1gh6vYVxB Js+dXDYRkKPO1zkLq0jTt1MRN0QR47NvBTxDDF7c9MULbgv5iAZx5Qbd1zam8nfly95s AiT8Sz7YT2I5XdgZyLDjxEWasKIvW7oi6Kquo= Received: by 10.142.223.4 with SMTP id v4mr2465690wfg.11.1245638785797; Sun, 21 Jun 2009 19:46:25 -0700 (PDT) Received: from ?192.168.2.115? (124-168-76-228.dyn.iinet.net.au [124.168.76.228]) by mx.google.com with ESMTPS id 30sm14914wfc.31.2009.06.21.19.46.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 21 Jun 2009 19:46:24 -0700 (PDT) Message-ID: <4A3EF072.1050008@gmail.com> Date: Mon, 22 Jun 2009 12:46:10 +1000 From: Julian Calaby User-Agent: Mozilla-Thunderbird 2.0.0.19 (X11/20090103) MIME-Version: 1.0 To: sparclinux CC: oftedal@gmail.com, David Miller , sam@ravnborg.org, reif@earthlink.net Subject: [PATCH 3/4] sparc: fix tftpboot.img build Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Sam Ravnborg Kjetil Oftedal mentioned that piggyback_32 was failing when building a sparc image. I tracked this down to the fact that the kernel no longer provided an absolute symbol named "end". Commit 86ed40bd6fe511d26bb8f3fa65a84cb65c235366 ("sparc: unify sections.h") renamed end to _end but failed to update piggyback_32. Signed-off-by: Sam Ravnborg Cc: Kjetil Oftedal Cc: Robert Reif Signed-off-by: Julian Calaby --- Sorry for the dupes! arch/sparc/boot/piggyback_32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/boot/piggyback_32.c b/arch/sparc/boot/piggyback_32.c index 3f0f933..e8dc9ad 100644 --- a/arch/sparc/boot/piggyback_32.c +++ b/arch/sparc/boot/piggyback_32.c @@ -84,7 +84,7 @@ int main(int argc,char **argv) while (fgets (buffer, 1024, map)) { if (!strcmp (buffer + 8, " T start\n") || !strcmp (buffer + 16, " T start\n")) start = strtoul (buffer, NULL, 16); - else if (!strcmp (buffer + 8, " A end\n") || !strcmp (buffer + 16, " A end\n")) + else if (!strcmp (buffer + 8, " A _end\n") || !strcmp (buffer + 16, " A _end\n")) end = strtoul (buffer, NULL, 16); } fclose (map);