efi/libstub: Drop __pure getters for EFI stub options

[linux-2.6-block.git] / drivers / firmware / efi / libstub / efi-stub.c

diff --git a/drivers/firmware/efi/libstub/efi-stub.c b/drivers/firmware/efi/libstub/efi-stub.c
index 8edfd4022803738d4fb2ad956c870fd3907f93ed..ee225b323687e41d6c5efa74aa3fb8de5626855a 100644 (file)
--- a/drivers/firmware/efi/libstub/efi-stub.c
+++ b/drivers/firmware/efi/libstub/efi-stub.c
@@ -263,7 +263,7 @@ efi_status_t efi_entry(efi_handle_t handle, efi_system_table_t *sys_table_arg)
        if (!fdt_addr)
                pr_efi("Generating empty DTB\n");
 
-       if (!noinitrd()) {
+       if (!efi_noinitrd) {
                max_addr = efi_get_max_initrd_addr(dram_base, image_addr);
                status = efi_load_initrd_dev_path(&initrd_addr, &initrd_size,
                                                  max_addr);
@@ -294,7 +294,7 @@ efi_status_t efi_entry(efi_handle_t handle, efi_system_table_t *sys_table_arg)
                           EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA);
 
        /* hibernation expects the runtime regions to stay in the same place */
-       if (!IS_ENABLED(CONFIG_HIBERNATION) && !nokaslr() && !flat_va_mapping) {
+       if (!IS_ENABLED(CONFIG_HIBERNATION) && !efi_nokaslr && !flat_va_mapping) {
                /*
                 * Randomize the base of the UEFI runtime services region.
                 * Preserve the 2 MB alignment of the region by taking a
@@ -367,7 +367,7 @@ void efi_get_virtmap(efi_memory_desc_t *memory_map, unsigned long map_size,
                size = in->num_pages * EFI_PAGE_SIZE;
 
                in->virt_addr = in->phys_addr;
-               if (novamap()) {
+               if (efi_novamap) {
                        continue;
                }