Merge branch 'x86/pat' into x86/core

4 files changed, 8 insertions, 56 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5e2919c0ff92..d9084320279e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1822,7 +1822,7 @@ config DMAR
           remapping devices.
 
 config DMAR_DEFAULT_ON
-        def_bool n
+        def_bool y
         prompt "Enable DMA Remapping Devices by default"
         depends on DMAR
         help
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h
index bd46495ff7de..86af26091d6c 100644
--- a/arch/x86/include/asm/iomap.h
+++ b/arch/x86/include/asm/iomap.h
@@ -24,10 +24,7 @@
 #include <asm/tlbflush.h>
 
 int
-reserve_io_memtype_wc(u64 base, unsigned long size, pgprot_t *prot);
-
-void
-free_io_memtype(u64 base, unsigned long size);
+is_io_mapping_possible(resource_size_t base, unsigned long size);
 
 void *
 iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
index d5e28424622c..04102d42ff42 100644
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -20,63 +20,16 @@
 #include <asm/pat.h>
 #include <linux/module.h>
 
-#ifdef CONFIG_X86_PAE
-static int
-is_io_mapping_possible(resource_size_t base, unsigned long size)
-{
-        return 1;
-}
-#else
-static int
-is_io_mapping_possible(resource_size_t base, unsigned long size)
+int is_io_mapping_possible(resource_size_t base, unsigned long size)
 {
+#ifndef CONFIG_X86_PAE
         /* There is no way to map greater than 1 << 32 address without PAE */
         if (base + size > 0x100000000ULL)
                 return 0;
-
-        return 1;
-}
 #endif
-
-int
-reserve_io_memtype_wc(u64 base, unsigned long size, pgprot_t *prot)
-{
-        unsigned long ret_flag;
-
-        if (!is_io_mapping_possible(base, size))
-                goto out_err;
-
-        if (!pat_enabled) {
-                *prot = pgprot_noncached(PAGE_KERNEL);
-                return 0;
-        }
-
-        if (reserve_memtype(base, base + size, _PAGE_CACHE_WC, &ret_flag))
-                goto out_err;
-
-        if (ret_flag == _PAGE_CACHE_WB)
-                goto out_free;
-
-        if (kernel_map_sync_memtype(base, size, ret_flag))
-                goto out_free;
-
-        *prot = __pgprot(__PAGE_KERNEL | ret_flag);
-        return 0;
-
-out_free:
-        free_memtype(base, base + size);
-out_err:
-        return -EINVAL;
-}
-EXPORT_SYMBOL_GPL(reserve_io_memtype_wc);
-
-void
-free_io_memtype(u64 base, unsigned long size)
-{
-        if (pat_enabled)
-                free_memtype(base, base + size);
+        return 1;
 }
-EXPORT_SYMBOL_GPL(free_io_memtype);
+EXPORT_SYMBOL_GPL(is_io_mapping_possible);
 
 /* Map 'pfn' using fixed map 'type' and protections 'prot'
  */
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index fdfedb65d45a..2ed37158012d 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -11,6 +11,7 @@
 #include <linux/bootmem.h>
 #include <linux/debugfs.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/gfp.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
@@ -889,6 +890,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot)
         else
                 return pgprot_noncached(prot);
 }
+EXPORT_SYMBOL_GPL(pgprot_writecombine);
 
 #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT)