All of lore.kernel.org
 help / color / mirror / Atom feed
* [tip: efi/core] efi/libstub: Export efi_low_alloc_above() to other units
@ 2020-09-18  8:30 tip-bot2 for Ard Biesheuvel
  0 siblings, 0 replies; only message in thread
From: tip-bot2 for Ard Biesheuvel @ 2020-09-18  8:30 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Maxim Uvarov, Ard Biesheuvel, x86, LKML

The following commit has been merged into the efi/core branch of tip:

Commit-ID:     1a895dbf4b66456bfb7da646cc9b1be3e24f4a1d
Gitweb:        https://git.kernel.org/tip/1a895dbf4b66456bfb7da646cc9b1be3e24f4a1d
Author:        Ard Biesheuvel <ardb@kernel.org>
AuthorDate:    Wed, 09 Sep 2020 16:16:20 +03:00
Committer:     Ard Biesheuvel <ardb@kernel.org>
CommitterDate: Wed, 16 Sep 2020 18:54:59 +03:00

efi/libstub: Export efi_low_alloc_above() to other units

Permit arm32-stub.c to access efi_low_alloc_above() in a subsequent
patch by giving it external linkage and declaring it in efistub.h.

Reviewed-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Tested-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 drivers/firmware/efi/libstub/efistub.h  | 3 +++
 drivers/firmware/efi/libstub/relocate.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
index 85050f5..158f86f 100644
--- a/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@ -740,6 +740,9 @@ efi_status_t efi_allocate_pages(unsigned long size, unsigned long *addr,
 efi_status_t efi_allocate_pages_aligned(unsigned long size, unsigned long *addr,
 					unsigned long max, unsigned long align);
 
+efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align,
+				 unsigned long *addr, unsigned long min);
+
 efi_status_t efi_relocate_kernel(unsigned long *image_addr,
 				 unsigned long image_size,
 				 unsigned long alloc_size,
diff --git a/drivers/firmware/efi/libstub/relocate.c b/drivers/firmware/efi/libstub/relocate.c
index 9b1aaf8..8ee9eb2 100644
--- a/drivers/firmware/efi/libstub/relocate.c
+++ b/drivers/firmware/efi/libstub/relocate.c
@@ -20,8 +20,8 @@
  *
  * Return:	status code
  */
-static efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align,
-					unsigned long *addr, unsigned long min)
+efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align,
+				 unsigned long *addr, unsigned long min)
 {
 	unsigned long map_size, desc_size, buff_size;
 	efi_memory_desc_t *map;

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2020-09-18  8:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-18  8:30 [tip: efi/core] efi/libstub: Export efi_low_alloc_above() to other units tip-bot2 for Ard Biesheuvel

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.