\r
#define PRESENT_MEMORY_ATTRIBUTES (EFI_RESOURCE_ATTRIBUTE_PRESENT)\r
\r
-#define EXCLUSIVE_MEMORY_ATTRIBUTES (EFI_MEMORY_UC | EFI_MEMORY_WC | \\r
- EFI_MEMORY_WT | EFI_MEMORY_WB | \\r
- EFI_MEMORY_WP | EFI_MEMORY_UCE)\r
-\r
-#define NONEXCLUSIVE_MEMORY_ATTRIBUTES (EFI_MEMORY_XP | EFI_MEMORY_RP | \\r
- EFI_MEMORY_RO)\r
-\r
//\r
// Module Variables\r
//\r
{\r
UINT64 CpuArchAttributes;\r
\r
- CpuArchAttributes = Attributes & NONEXCLUSIVE_MEMORY_ATTRIBUTES;\r
+ CpuArchAttributes = Attributes & EFI_MEMORY_ATTRIBUTE_MASK;\r
\r
if ( (Attributes & EFI_MEMORY_UC) == EFI_MEMORY_UC) {\r
CpuArchAttributes |= EFI_MEMORY_UC;\r
// Keep original CPU arch attributes when caller just calls\r
// SetMemorySpaceAttributes() with none CPU arch attributes (for example, RUNTIME).\r
//\r
- Attributes |= (Entry->Attributes & (EXCLUSIVE_MEMORY_ATTRIBUTES | NONEXCLUSIVE_MEMORY_ATTRIBUTES));\r
+ Attributes |= (Entry->Attributes & (EFI_CACHE_ATTRIBUTE_MASK | EFI_MEMORY_ATTRIBUTE_MASK));\r
}\r
Entry->Attributes = Attributes;\r
break;\r