From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LuD0O-0000OA-21 for mharc-grub-devel@gnu.org; Wed, 15 Apr 2009 17:50:52 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LuD0N-0000O5-72 for grub-devel@gnu.org; Wed, 15 Apr 2009 17:50:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LuD0H-0000Nq-RU for grub-devel@gnu.org; Wed, 15 Apr 2009 17:50:49 -0400 Received: from [199.232.76.173] (port=34735 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LuD0H-0000Nn-LD for grub-devel@gnu.org; Wed, 15 Apr 2009 17:50:45 -0400 Received: from c60.cesmail.net ([216.154.195.49]:50368) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1LuD0H-0002f4-4p for grub-devel@gnu.org; Wed, 15 Apr 2009 17:50:45 -0400 Received: from unknown (HELO smtprelay2.cesmail.net) ([192.168.1.112]) by c60.cesmail.net with ESMTP; 15 Apr 2009 17:50:43 -0400 Received: from [192.168.0.22] (static-72-92-88-10.phlapa.fios.verizon.net [72.92.88.10]) by smtprelay2.cesmail.net (Postfix) with ESMTPSA id 3D67434C6A for ; Wed, 15 Apr 2009 17:52:22 -0400 (EDT) From: Pavel Roskin To: The development of GRUB 2 In-Reply-To: <20090415213416.GA27790@localdomain> References: <20090415213416.GA27790@localdomain> Content-Type: text/plain Date: Wed, 15 Apr 2009 17:50:42 -0400 Message-Id: <1239832242.8204.3.camel@mj> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Content-Transfer-Encoding: 7bit X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: r2074 broke ata module X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 21:50:51 -0000 On Wed, 2009-04-15 at 17:34 -0400, Ward Vandewege wrote: > Hi there, > > I tried to use the ata module today in combination with grub2's coreboot > code, but found that it broke in r2074, specifically by this hunk: Actually, I was looking at the warnings, and it looks like the warnings about grub_pci_iterate() are directly related to this problem. This patch should help. Index: disk/ata.c =================================================================== --- disk/ata.c (revision 2120) +++ disk/ata.c (working copy) @@ -375,7 +375,7 @@ return 0; } -static int +static int NESTED_FUNC_ATTR grub_ata_pciinit (int bus, int device, int func, grub_pci_id_t pciid __attribute__((unused))) { Index: bus/usb/ohci.c =================================================================== --- bus/usb/ohci.c (revision 2120) +++ bus/usb/ohci.c (working copy) @@ -112,8 +112,9 @@ /* Iterate over all PCI devices. Determine if a device is an OHCI controller. If this is the case, initialize it. */ -static int grub_ohci_pci_iter (int bus, int device, int func, - grub_pci_id_t pciid __attribute__((unused))) +static int NESTED_FUNC_ATTR +grub_ohci_pci_iter (int bus, int device, int func, + grub_pci_id_t pciid __attribute__((unused))) { grub_uint32_t class; grub_uint32_t subclass; Index: bus/usb/uhci.c =================================================================== --- bus/usb/uhci.c (revision 2120) +++ bus/usb/uhci.c (working copy) @@ -137,8 +137,9 @@ /* Iterate over all PCI devices. Determine if a device is an UHCI controller. If this is the case, initialize it. */ -static int grub_uhci_pci_iter (int bus, int device, int func, - grub_pci_id_t pciid __attribute__((unused))) +static int NESTED_FUNC_ATTR +grub_uhci_pci_iter (int bus, int device, int func, + grub_pci_id_t pciid __attribute__((unused))) { grub_uint32_t class; grub_uint32_t subclass; Index: commands/lspci.c =================================================================== --- commands/lspci.c (revision 2120) +++ commands/lspci.c (working copy) @@ -114,7 +114,7 @@ return 0; } -static int +static int NESTED_FUNC_ATTR grub_lspci_iter (int bus, int dev, int func, grub_pci_id_t pciid) { grub_uint32_t class; -- Regards, Pavel Roskin