From: Pavel Roskin <proski@gnu.org>
To: The development of GRUB 2 <grub-devel@gnu.org>
Subject: Re: r2074 broke ata module
Date: Wed, 15 Apr 2009 17:50:42 -0400 [thread overview]
Message-ID: <1239832242.8204.3.camel@mj> (raw)
In-Reply-To: <20090415213416.GA27790@localdomain>
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
next prev parent reply other threads:[~2009-04-15 21:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-15 21:34 r2074 broke ata module Ward Vandewege
2009-04-15 21:50 ` Pavel Roskin [this message]
2009-04-17 14:39 ` Ward Vandewege
2009-04-17 15:37 ` Pavel Roskin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1239832242.8204.3.camel@mj \
--to=proski@gnu.org \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.