-#if defined (MDE_CPU_IPF)\r
-///\r
-/// For Itanium machines make the default allocations 8K aligned\r
-///\r
-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT (EFI_PAGE_SIZE * 2)\r
-#define DEFAULT_PAGE_ALLOCATION (EFI_PAGE_SIZE * 2)\r
-\r
-#elif defined (MDE_CPU_AARCH64)\r
-///\r
-/// 64-bit ARM systems allow the OS to execute with 64 KB page size,\r
-/// so for improved interoperability with the firmware, align the\r
-/// runtime regions to 64 KB as well\r
-///\r
-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT (SIZE_64KB)\r
-#define DEFAULT_PAGE_ALLOCATION (EFI_PAGE_SIZE)\r
-\r
-#else\r
-///\r
-/// For genric EFI machines make the default allocations 4K aligned\r
-///\r
-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT (EFI_PAGE_SIZE)\r
-#define DEFAULT_PAGE_ALLOCATION (EFI_PAGE_SIZE)\r
-\r
-#endif\r
-\r
+//\r
+// +---------------------------------------------------+\r
+// | 0..(EfiMaxMemoryType - 1) - Normal memory type |\r
+// +---------------------------------------------------+\r
+// | EfiMaxMemoryType..0x6FFFFFFF - Invalid |\r
+// +---------------------------------------------------+\r
+// | 0x70000000..0x7FFFFFFF - OEM reserved |\r
+// +---------------------------------------------------+\r
+// | 0x80000000..0xFFFFFFFF - OS reserved |\r
+// +---------------------------------------------------+\r
+//\r
+#define MEMORY_TYPE_OS_RESERVED_MIN 0x80000000\r
+#define MEMORY_TYPE_OS_RESERVED_MAX 0xFFFFFFFF\r
+#define MEMORY_TYPE_OEM_RESERVED_MIN 0x70000000\r
+#define MEMORY_TYPE_OEM_RESERVED_MAX 0x7FFFFFFF\r