diff options
| -rw-r--r-- | arch/ia64/mm/ioremap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c index 62328621f99c..643ccc6960ce 100644 --- a/arch/ia64/mm/ioremap.c +++ b/arch/ia64/mm/ioremap.c | |||
| @@ -21,12 +21,12 @@ __ioremap (unsigned long offset, unsigned long size) | |||
| 21 | void __iomem * | 21 | void __iomem * |
| 22 | ioremap (unsigned long offset, unsigned long size) | 22 | ioremap (unsigned long offset, unsigned long size) |
| 23 | { | 23 | { |
| 24 | if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC)) | ||
| 25 | return __ioremap(offset, size); | ||
| 26 | |||
| 27 | if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB)) | 24 | if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB)) |
| 28 | return phys_to_virt(offset); | 25 | return phys_to_virt(offset); |
| 29 | 26 | ||
| 27 | if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC)) | ||
| 28 | return __ioremap(offset, size); | ||
| 29 | |||
| 30 | /* | 30 | /* |
| 31 | * Someday this should check ACPI resources so we | 31 | * Someday this should check ACPI resources so we |
| 32 | * can do the right thing for hot-plugged regions. | 32 | * can do the right thing for hot-plugged regions. |
