Re: r2074 broke ata module

[Pavel Roskin]

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