x86: use set_memory.h header

[karo-tx-linux.git] / arch / x86 / platform / efi / efi.c

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 565dff3c9a12cf1f042fae494d1bdb3a55d032b3..7e76a4d8304bc5add30e5f86d16e4f5b423a24f6 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -47,8 +47,9 @@
 
 #include <asm/setup.h>
 #include <asm/efi.h>
+#include <asm/e820/api.h>
 #include <asm/time.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
 #include <asm/tlbflush.h>
 #include <asm/x86_init.h>
 #include <asm/uv/uv.h>
@@ -139,21 +140,21 @@ static void __init do_add_efi_memmap(void)
                case EFI_BOOT_SERVICES_DATA:
                case EFI_CONVENTIONAL_MEMORY:
                        if (md->attribute & EFI_MEMORY_WB)
-                               e820_type = E820_RAM;
+                               e820_type = E820_TYPE_RAM;
                        else
-                               e820_type = E820_RESERVED;
+                               e820_type = E820_TYPE_RESERVED;
                        break;
                case EFI_ACPI_RECLAIM_MEMORY:
-                       e820_type = E820_ACPI;
+                       e820_type = E820_TYPE_ACPI;
                        break;
                case EFI_ACPI_MEMORY_NVS:
-                       e820_type = E820_NVS;
+                       e820_type = E820_TYPE_NVS;
                        break;
                case EFI_UNUSABLE_MEMORY:
-                       e820_type = E820_UNUSABLE;
+                       e820_type = E820_TYPE_UNUSABLE;
                        break;
                case EFI_PERSISTENT_MEMORY:
-                       e820_type = E820_PMEM;
+                       e820_type = E820_TYPE_PMEM;
                        break;
                default:
                        /*
@@ -161,12 +162,12 @@ static void __init do_add_efi_memmap(void)
                         * EFI_RUNTIME_SERVICES_DATA EFI_MEMORY_MAPPED_IO
                         * EFI_MEMORY_MAPPED_IO_PORT_SPACE EFI_PAL_CODE
                         */
-                       e820_type = E820_RESERVED;
+                       e820_type = E820_TYPE_RESERVED;
                        break;
                }
-               e820_add_region(start, size, e820_type);
+               e820__range_add(start, size, e820_type);
        }
-       sanitize_e820_map(e820->map, ARRAY_SIZE(e820->map), &e820->nr_map);
+       e820__update_table(e820_table);
 }
 
 int __init efi_memblock_x86_reserve_range(void)