From 71bb4bc8d7052799c1b9a96015bdc4292beaeb2b Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 30 Mar 2006 09:53:39 -0700 Subject: [PATCH] --- yaml --- r: 24772 b: refs/heads/master c: c1c57d767100417f63c18da52d7e96f82b2b9e1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/mm/ioremap.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b19a0daaf99..8770bdbadcba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3283a67d8618c9a292eced23e8753ab64adc6dba +refs/heads/master: c1c57d767100417f63c18da52d7e96f82b2b9e1a diff --git a/trunk/arch/ia64/mm/ioremap.c b/trunk/arch/ia64/mm/ioremap.c index 62328621f99c..643ccc6960ce 100644 --- a/trunk/arch/ia64/mm/ioremap.c +++ b/trunk/arch/ia64/mm/ioremap.c @@ -21,12 +21,12 @@ __ioremap (unsigned long offset, unsigned long size) void __iomem * ioremap (unsigned long offset, unsigned long size) { - if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC)) - return __ioremap(offset, size); - if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB)) return phys_to_virt(offset); + if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC)) + return __ioremap(offset, size); + /* * Someday this should check ACPI resources so we * can do the right thing for hot-plugged regions.