These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / video / fbdev / amifb.c

diff --git a/kernel/drivers/video/fbdev/amifb.c b/kernel/drivers/video/fbdev/amifb.c
index 35f7900..1d702e1 100644 (file)
--- a/kernel/drivers/video/fbdev/amifb.c
+++ b/kernel/drivers/video/fbdev/amifb.c
@@ -2052,7 +2052,7 @@ static void ami_set_sprite(const struct amifb_par *par)
 {
        copins *copl, *cops;
        u_short hs, vs, ve;
-       u_long pl, ps, pt;
+       u_long pl, ps;
        short mx, my;
 
        cops = copdisplay.list[currentcop][0];
@@ -2078,7 +2078,7 @@ static void ami_set_sprite(const struct amifb_par *par)
                        if (mod2(vs)) {
                                lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
                                shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve + 1);
-                               pt = pl; pl = ps; ps = pt;
+                               swap(pl, ps);
                        } else {
                                lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve + 1);
                                shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve);
@@ -3705,8 +3705,8 @@ default_chipset:
         * access the videomem with writethrough cache
         */
        info->fix.smem_start = (u_long)ZTWO_PADDR(videomemory);
-       videomemory = (u_long)ioremap_writethrough(info->fix.smem_start,
-                                                  info->fix.smem_len);
+       videomemory = (u_long)ioremap_wt(info->fix.smem_start,
+                                        info->fix.smem_len);
        if (!videomemory) {
                dev_warn(&pdev->dev,
                         "Unable to map videomem cached writethrough\n");