|
@@ -428,9 +428,6 @@ void __init efi_enter_virtual_mode(void)
|
|
else
|
|
else
|
|
va = efi_ioremap(md->phys_addr, size);
|
|
va = efi_ioremap(md->phys_addr, size);
|
|
|
|
|
|
- if (md->attribute & EFI_MEMORY_WB)
|
|
|
|
- set_memory_uc(md->virt_addr, size);
|
|
|
|
-
|
|
|
|
md->virt_addr = (u64) (unsigned long) va;
|
|
md->virt_addr = (u64) (unsigned long) va;
|
|
|
|
|
|
if (!va) {
|
|
if (!va) {
|
|
@@ -439,6 +436,9 @@ void __init efi_enter_virtual_mode(void)
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (!(md->attribute & EFI_MEMORY_WB))
|
|
|
|
+ set_memory_uc(md->virt_addr, size);
|
|
|
|
+
|
|
systab = (u64) (unsigned long) efi_phys.systab;
|
|
systab = (u64) (unsigned long) efi_phys.systab;
|
|
if (md->phys_addr <= systab && systab < end) {
|
|
if (md->phys_addr <= systab && systab < end) {
|
|
systab += md->virt_addr - md->phys_addr;
|
|
systab += md->virt_addr - md->phys_addr;
|