x86: revert ucminus change

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

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 3d0a589d92c40ebcf33882bf9d1b331894953037..df95d1d6b4dfbd3caf30a89d61ff2cb014c532fb 100644 (file)
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -159,11 +159,7 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
        switch (mode) {
        case IOR_MODE_UNCACHED:
        default:
-               /*
-                * FIXME: we will use UC MINUS for now, as video fb drivers
-                * depend on it. Upcoming ioremap_wc() will fix this behavior.
-                */
-               prot = PAGE_KERNEL_UC_MINUS;
+               prot = PAGE_KERNEL_NOCACHE;
                break;
        case IOR_MODE_CACHED:
                prot = PAGE_KERNEL;