kern/ieee1275/init/ppc64: Rename regions_claim() to grub_regions_claim()

Rename regions_claim() to grub_regions_claim() to make it available for
memory allocation. The ieee1275 loader will use this function on PowerVM
and KVM on Power and thus avoid usage of memory that it is not allowed
to use.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Cc: Hari Bathini <hbathini@linux.ibm.com>
Cc: Pavithra Prakash <pavrampu@in.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Carolyn Scherrer <cpscherr@us.ibm.com>
Cc: Mahesh Salgaonkar <mahesh@linux.ibm.com>
Cc: Sourabh Jain <sourabhjain@linux.ibm.com>

diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
index 9a1243639c375b692a3481d6bc69bcf25080eb32..a92558e0e2d61dfb01e745d588c24beded654c06 100644 (file)
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -318,9 +318,9 @@ count_free (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
   return 0;
 }
 
-static int
-regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
-              void *data)
+int
+grub_regions_claim (grub_uint64_t addr, grub_uint64_t len,
+                   grub_memory_type_t type, void *data)
 {
   struct regions_claim_request *rcr = data;
   grub_uint64_t linux_rmo_save;
@@ -555,7 +555,7 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
   };
   int ret;
 
-  ret = regions_claim (addr, len, type, &rcr);
+  ret = grub_regions_claim (addr, len, type, &rcr);
 
   *(grub_uint32_t *) data = rcr.total;
 
@@ -573,7 +573,7 @@ region_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
   };
   int ret;
 
-  ret = regions_claim (addr, len, type, &rcr);
+  ret = grub_regions_claim (addr, len, type, &rcr);
 
   *(grub_uint32_t *) data = rcr.total;
 

diff --git a/include/grub/ieee1275/alloc.h b/include/grub/ieee1275/alloc.h
index e314c989de93f11d6e6ebce6c514582b6d95d195..67a78565726f716664cf2c287f8e7cc7e68a37a7 100644 (file)
--- a/include/grub/ieee1275/alloc.h
+++ b/include/grub/ieee1275/alloc.h
@@ -33,4 +33,7 @@ struct regions_claim_request {
   grub_size_t align;      /* alignment restrictions */
 };
 
+int EXPORT_FUNC(grub_regions_claim) (grub_uint64_t addr, grub_uint64_t len,
+                                    grub_memory_type_t type, void *data);
+
 #endif /* GRUB_IEEE1275_ALLOC_HEADER */