From 22a7cc9a6f5e61de79b34f09c97a71a12dd370a2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 24 Dec 2010 17:09:56 +0100
Subject: [PATCH] fix 3rd argument to scsi_iterate

---
 grub-core/disk/ata.c   | 2 +-
 grub-core/disk/scsi.c  | 4 ++--
 grub-core/disk/usbms.c | 2 +-
 include/grub/scsi.h    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/grub-core/disk/ata.c b/grub-core/disk/ata.c
index 9f62546e1..6f7f44227 100644
--- a/grub-core/disk/ata.c
+++ b/grub-core/disk/ata.c
@@ -508,7 +508,7 @@ grub_atapi_open (int id, int bus, struct grub_scsi *scsi)
 }
 
 static int
-grub_atapi_iterate (int (*hook_in) (int id, int bus, int luns))
+grub_atapi_iterate (int NESTED_FUNC_ATTR (*hook_in) (int id, int bus, int luns))
 {
   auto int hook (int id, int bus);
   int hook (int id, int bus)
diff --git a/grub-core/disk/scsi.c b/grub-core/disk/scsi.c
index b989a98ad..015e5dce6 100644
--- a/grub-core/disk/scsi.c
+++ b/grub-core/disk/scsi.c
@@ -324,9 +324,9 @@ grub_scsi_iterate (int (*hook) (const char *name))
 {
   grub_scsi_dev_t p;
 
-  auto int scsi_iterate (int id, int bus, int luns);
+  auto int NESTED_FUNC_ATTR scsi_iterate (int id, int bus, int luns);
 
-  int scsi_iterate (int id, int bus, int luns)
+  int NESTED_FUNC_ATTR scsi_iterate (int id, int bus, int luns)
     {
       int i;
 
diff --git a/grub-core/disk/usbms.c b/grub-core/disk/usbms.c
index 4e1af7be3..8041c6c95 100644
--- a/grub-core/disk/usbms.c
+++ b/grub-core/disk/usbms.c
@@ -205,7 +205,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
 
 
 static int
-grub_usbms_iterate (int (*hook) (int id, int bus, int luns))
+grub_usbms_iterate (int NESTED_FUNC_ATTR (*hook) (int id, int bus, int luns))
 {
   unsigned i;
 
diff --git a/include/grub/scsi.h b/include/grub/scsi.h
index 3deb18f1b..5b6ccc9f4 100644
--- a/include/grub/scsi.h
+++ b/include/grub/scsi.h
@@ -50,7 +50,7 @@ grub_make_scsi_id (int subsystem, int bus, int lun)
 struct grub_scsi_dev
 {
   /* Call HOOK with each device name, until HOOK returns non-zero.  */
-  int (*iterate) (int (*hook) (int id, int bus, int luns));
+  int (*iterate) (int NESTED_FUNC_ATTR (*hook) (int id, int bus, int luns));
 
   /* Open the device named NAME, and set up SCSI.  */
   grub_err_t (*open) (int id, int bus, struct grub_scsi *scsi);