Merge branch 'master'

4 files changed, 5 insertions, 9 deletions

diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index b058273527bb..76448d6ae896 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -1269,7 +1269,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
                  */
                 page = virt_to_page(virtual_start);
                 ClearPageReserved(page);
-                set_page_count(page, 1);
+                init_page_count(page);
                 free_page(virtual_start);
 
                 virtual_start += PAGE_SIZE;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 996c7b58564e..07d882b14396 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1169,11 +1169,6 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
         vma->vm_pgoff = off >> PAGE_SHIFT;
         /* This is an IO map - tell maydump to skip this VMA */
         vma->vm_flags |= VM_IO | VM_RESERVED;
-#if defined(__sparc_v9__)
-        if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
-                                vma->vm_end - vma->vm_start, vma->vm_page_prot))
-                return -EAGAIN;
-#else
 #if defined(__mc68000__)
 #if defined(CONFIG_SUN3)
         pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
@@ -1195,7 +1190,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 #elif defined(__i386__) || defined(__x86_64__)
         if (boot_cpu_data.x86 > 3)
                 pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
-#elif defined(__mips__)
+#elif defined(__mips__) || defined(__sparc_v9__)
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 #elif defined(__hppa__)
         pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
@@ -1212,7 +1207,6 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
         if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
                              vma->vm_end - vma->vm_start, vma->vm_page_prot))
                 return -EAGAIN;
-#endif /* !__sparc_v9__ */
         return 0;
 #endif /* !sparc32 */
 }
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index d8467c03b49f..788297e9d59e 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 int size = ((cursor->image.width + 7) >> 3) *
                         cursor->image.height;
                 int i;
-                u8 *data = kmalloc(64 * 8, GFP_KERNEL);
+                u8 *data = kmalloc(64 * 8, GFP_ATOMIC);
 
                 if (data == NULL)
                         return -ENOMEM;
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index a4d7cc51ce0b..34ef859ee414 100644
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -58,6 +58,8 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
         /* To stop the swapper from even considering these pages */
         vma->vm_flags |= (VM_IO | VM_RESERVED);
         
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
         /* Each page, see which map applies */
         for (page = 0; page < size; ){
                 map_size = 0;