Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / mips / kernel / vpe.c

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 06be405..ae83b75 100644 (file)
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -99,9 +99,9 @@ struct vpe {
 
        /* elfloader stuff */
        void *load_addr;
-       u32 len;
+       unsigned long len;
        char *pbuffer;
-       u32 plen;
+       unsigned long plen;
 
        unsigned long __start;
 
@@ -253,11 +253,11 @@ void dump_mtregs(void)
 }
 
 /* Find some VPE program space  */
-static void *alloc_progmem(u32 len)
+static void *alloc_progmem(unsigned long len)
 {
 #ifdef CONFIG_MIPS_VPE_LOADER_TOM
        /* this means you must tell linux to use less memory than you physically have */
-       return (void *)((max_pfn * PAGE_SIZE) + KSEG0);
+       return pfn_to_kaddr(max_pfn);
 #else
        // simple grab some mem for now
        return kmalloc(len, GFP_KERNEL);
@@ -1171,7 +1171,8 @@ static int __init vpe_module_init(void)
                return -ENODEV;
        }
 
-       if ((major = register_chrdev(0, module_name, &vpe_fops) < 0)) {
+       major = register_chrdev(0, module_name, &vpe_fops);
+       if (major < 0) {
                printk("VPE loader: unable to register character device\n");
                return major;
        }