diff options
Diffstat (limited to 'drivers/firmware')
-rw-r--r-- | drivers/firmware/efi/efi-stub-helper.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c index 05c539e9a3c8..2f528fb541f9 100644 --- a/drivers/firmware/efi/efi-stub-helper.c +++ b/drivers/firmware/efi/efi-stub-helper.c | |||
@@ -86,7 +86,7 @@ fail: | |||
86 | /* | 86 | /* |
87 | * Allocate at the highest possible address that is not above 'max'. | 87 | * Allocate at the highest possible address that is not above 'max'. |
88 | */ | 88 | */ |
89 | static efi_status_t high_alloc(efi_system_table_t *sys_table_arg, | 89 | static efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg, |
90 | unsigned long size, unsigned long align, | 90 | unsigned long size, unsigned long align, |
91 | unsigned long *addr, unsigned long max) | 91 | unsigned long *addr, unsigned long max) |
92 | { | 92 | { |
@@ -165,8 +165,8 @@ fail: | |||
165 | /* | 165 | /* |
166 | * Allocate at the lowest possible address. | 166 | * Allocate at the lowest possible address. |
167 | */ | 167 | */ |
168 | static efi_status_t low_alloc(efi_system_table_t *sys_table_arg, | 168 | static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg, |
169 | unsigned long size, unsigned long align, | 169 | unsigned long size, unsigned long align, |
170 | unsigned long *addr) | 170 | unsigned long *addr) |
171 | { | 171 | { |
172 | unsigned long map_size, desc_size; | 172 | unsigned long map_size, desc_size; |
@@ -226,7 +226,7 @@ fail: | |||
226 | return status; | 226 | return status; |
227 | } | 227 | } |
228 | 228 | ||
229 | static void low_free(efi_system_table_t *sys_table_arg, unsigned long size, | 229 | static void efi_free(efi_system_table_t *sys_table_arg, unsigned long size, |
230 | unsigned long addr) | 230 | unsigned long addr) |
231 | { | 231 | { |
232 | unsigned long nr_pages; | 232 | unsigned long nr_pages; |
@@ -407,8 +407,8 @@ grow: | |||
407 | * addresses in memory, so allocate enough memory for | 407 | * addresses in memory, so allocate enough memory for |
408 | * all the initrd's. | 408 | * all the initrd's. |
409 | */ | 409 | */ |
410 | status = high_alloc(sys_table_arg, initrd_total, 0x1000, | 410 | status = efi_high_alloc(sys_table_arg, initrd_total, 0x1000, |
411 | &initrd_addr, hdr->initrd_addr_max); | 411 | &initrd_addr, hdr->initrd_addr_max); |
412 | if (status != EFI_SUCCESS) { | 412 | if (status != EFI_SUCCESS) { |
413 | efi_printk(sys_table_arg, "Failed to alloc highmem for initrds\n"); | 413 | efi_printk(sys_table_arg, "Failed to alloc highmem for initrds\n"); |
414 | goto close_handles; | 414 | goto close_handles; |
@@ -456,7 +456,7 @@ grow: | |||
456 | return status; | 456 | return status; |
457 | 457 | ||
458 | free_initrd_total: | 458 | free_initrd_total: |
459 | low_free(sys_table_arg, initrd_total, initrd_addr); | 459 | efi_free(sys_table_arg, initrd_total, initrd_addr); |
460 | 460 | ||
461 | close_handles: | 461 | close_handles: |
462 | for (k = j; k < i; k++) | 462 | for (k = j; k < i; k++) |