Merge tag 'for_v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / btext.c

diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index b2072d5bbf2bb3a9252ca359686ed3a3a740bea0..b4241ed1456ece186edc936aa0c04c8a0afeb409 100644 (file)
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -163,7 +163,7 @@ void btext_map(void)
        offset = ((unsigned long) dispDeviceBase) - base;
        size = dispDeviceRowBytes * dispDeviceRect[3] + offset
                + dispDeviceRect[0];
-       vbase = __ioremap(base, size, pgprot_val(pgprot_noncached_wc(__pgprot(0))));
+       vbase = ioremap_wc(base, size);
        if (!vbase)
                return;
        logicalDisplayBase = vbase + offset;