KVM: VMX: Remove vmx->msr_offset_efer

[safe/jmp/linux-2.6] / drivers / video / pm3fb.c

diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 6a64b93..6666f45 100644 (file)
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -45,7 +45,7 @@
 #undef PM3FB_MASTER_DEBUG
 #ifdef PM3FB_MASTER_DEBUG
 #define DPRINTK(a, b...)       \
-       printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b)
+       printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)
 #else
 #define DPRINTK(a, b...)
 #endif
@@ -110,7 +110,8 @@ static inline void PM3_WRITE_REG(struct pm3_par *par, s32 off, u32 v)
 
 static inline void PM3_WAIT(struct pm3_par *par, u32 n)
 {
-       while (PM3_READ_REG(par, PM3InFIFOSpace) < n);
+       while (PM3_READ_REG(par, PM3InFIFOSpace) < n)
+               cpu_relax();
 }
 
 static inline void PM3_WRITE_DAC_REG(struct pm3_par *par, unsigned r, u8 v)
@@ -209,8 +210,8 @@ static int pm3fb_sync(struct fb_info *info)
        PM3_WRITE_REG(par, PM3Sync, 0);
        mb();
        do {
-               while ((PM3_READ_REG(par, PM3OutFIFOWords)) == 0);
-               rmb();
+               while ((PM3_READ_REG(par, PM3OutFIFOWords)) == 0)
+                       cpu_relax();
        } while ((PM3_READ_REG(par, PM3OutputFifo)) != PM3Sync_Tag);
 
        return 0;
@@ -538,8 +539,10 @@ static void pm3fb_imageblit(struct fb_info *info, const struct fb_image *image)
                bgx = par->palette[image->bg_color];
                break;
        }
-       if (image->depth != 1)
-               return cfb_imageblit(info, image);
+       if (image->depth != 1) {
+               cfb_imageblit(info, image);
+               return;
+       }
 
        if (info->var.bits_per_pixel == 8) {
                fgx |= fgx << 8;
@@ -1226,7 +1229,7 @@ static struct fb_ops pm3fb_ops = {
 
 /* mmio register are already mapped when this function is called */
 /* the pm3fb_fix.smem_start is also set */
-static unsigned long pm3fb_size_memory(struct pm3_par *par)
+static unsigned long __devinit pm3fb_size_memory(struct pm3_par *par)
 {
        unsigned long   memsize = 0;
        unsigned long   tempBypass, i, temp1, temp2;
@@ -1570,6 +1573,8 @@ module_exit(pm3fb_exit);
 #endif
 module_init(pm3fb_init);
 
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
 module_param(noaccel, bool, 0);
 MODULE_PARM_DESC(noaccel, "Disable acceleration");
 module_param(hwcursor, int, 0644);