Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

	arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 24 insertions, 1 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 45e546c4ba78..115f13ee40c9 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -300,6 +300,29 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
 }
 EXPORT_SYMBOL(ioremap_cache);
 
+static void __iomem *ioremap_default(resource_size_t phys_addr,
+                                        unsigned long size)
+{
+        unsigned long flags;
+        void *ret;
+        int err;
+
+        /*
+         * - WB for WB-able memory and no other conflicting mappings
+         * - UC_MINUS for non-WB-able memory with no other conflicting mappings
+         * - Inherit from confliting mappings otherwise
+         */
+        err = reserve_memtype(phys_addr, phys_addr + size, -1, &flags);
+        if (err < 0)
+                return NULL;
+
+        ret = (void *) __ioremap_caller(phys_addr, size, flags,
+                                        __builtin_return_address(0));
+
+        free_memtype(phys_addr, phys_addr + size);
+        return (void __iomem *)ret;
+}
+
 /**
  * iounmap - Free a IO remapping
  * @addr: virtual address from ioremap_*
@@ -365,7 +388,7 @@ void *xlate_dev_mem_ptr(unsigned long phys)
         if (page_is_ram(start >> PAGE_SHIFT))
                 return __va(phys);
 
-        addr = (void __force *)ioremap(start, PAGE_SIZE);
+        addr = (void __force *)ioremap_default(start, PAGE_SIZE);
         if (addr)
                 addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));