aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/mm/ioremap.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2006-03-30 09:53:39 -0700
committerTony Luck <tony.luck@intel.com>2006-03-30 09:05:41 -0800
commitc1c57d767100417f63c18da52d7e96f82b2b9e1a (patch)
treec8427f85c043e50845b3226699fcf6c16d380b05 /arch/ia64/mm/ioremap.c
parent3283a67d8618c9a292eced23e8753ab64adc6dba (diff)
downloadlinux-2.6.38-lt-ux500-c1c57d767100417f63c18da52d7e96f82b2b9e1a.tar.gz
[IA64] ioremap() should prefer WB over UC
efi_memmap_init() collects full granules of WB memory, without regard for whether they also support UC. So in order for ioremap() to work for main memory, it must prefer WB mappings when possible. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm/ioremap.c')
-rw-r--r--arch/ia64/mm/ioremap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c
index 62328621f99..643ccc6960c 100644
--- a/arch/ia64/mm/ioremap.c
+++ b/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.