From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NJEmm-0007uZ-Az for mharc-grub-devel@gnu.org; Fri, 11 Dec 2009 18:20:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJEmk-0007tk-Nd for grub-devel@gnu.org; Fri, 11 Dec 2009 18:20:30 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJEmf-0007ni-Mb for grub-devel@gnu.org; Fri, 11 Dec 2009 18:20:30 -0500 Received: from [199.232.76.173] (port=42016 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJEmf-0007nR-E3 for grub-devel@gnu.org; Fri, 11 Dec 2009 18:20:25 -0500 Received: from xvm-190-8.ghst.net ([217.70.190.8]:43838 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NJEmf-0001SI-4e for grub-devel@gnu.org; Fri, 11 Dec 2009 18:20:25 -0500 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1NJEma-0003tw-2L; Sat, 12 Dec 2009 00:20:21 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1NJEmX-0003C9-1W; Sat, 12 Dec 2009 00:20:17 +0100 Date: Sat, 12 Dec 2009 00:20:17 +0100 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20091211232016.GA12276@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="/9DWx/yDrRhgMJTb" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Vladimir 'phcoder' Serbinenko Subject: grub_elf32_size() X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2009 23:20:31 -0000 --/9DWx/yDrRhgMJTb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Not sure if I missed something obvious, but this commit (relocator branch) seems to break compilation rather than fix it. Was grub_elf32_size() number of args meant to be changed? -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --/9DWx/yDrRhgMJTb Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="r1899.diff" ------------------------------------------------------------ revno: 1899 committer: Vladimir 'phcoder' Serbinenko branch nick: relocators timestamp: Thu 2009-12-03 22:45:41 +0100 message: Fix compilation issue for ppc === modified file 'loader/powerpc/ieee1275/linux.c' --- loader/powerpc/ieee1275/linux.c 2009-06-21 23:55:23 +0000 +++ loader/powerpc/ieee1275/linux.c 2009-12-03 21:45:41 +0000 @@ -110,7 +110,7 @@ grub_linux_load32 (grub_elf_t elf) if (entry == 0) entry = 0x01400000; - linux_size = grub_elf32_size (elf); + linux_size = grub_elf32_size (elf, 0); if (linux_size == 0) return grub_errno; /* Pad it; the kernel scribbles over memory beyond its load address. */ @@ -160,7 +160,7 @@ grub_linux_load64 (grub_elf_t elf) if (entry == 0) entry = 0x01400000; - linux_size = grub_elf64_size (elf); + linux_size = grub_elf64_size (elf, 0); if (linux_size == 0) return grub_errno; /* Pad it; the kernel scribbles over memory beyond its load address. */ --/9DWx/yDrRhgMJTb--