patch-2.4.2 linux/drivers/video/fbmem.c
Next file: linux/drivers/video/g364fb.c
Previous file: linux/drivers/video/fbcon.c
Back to the patch index
Back to the overall index
- Lines: 25
- Date:
Fri Feb 9 11:30:23 2001
- Orig file:
v2.4.1/linux/drivers/video/fbmem.c
- Orig date:
Thu Jan 4 13:00:55 2001
diff -u --recursive --new-file v2.4.1/linux/drivers/video/fbmem.c linux/drivers/video/fbmem.c
@@ -17,7 +17,7 @@
#include <linux/smp_lock.h>
#include <linux/kernel.h>
#include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/mman.h>
#include <linux/tty.h>
#include <linux/console.h>
@@ -598,12 +598,9 @@
pgprot_val(vma->vm_page_prot) &= ~_CACHE_MASK;
pgprot_val(vma->vm_page_prot) |= _CACHE_UNCACHED;
#elif defined(__arm__)
-#if defined(CONFIG_CPU_32) && !defined(CONFIG_ARCH_ACORN)
- /* On Acorn architectures, we want to keep the framebuffer
- * cached.
- */
- pgprot_val(vma->vm_page_prot) &= ~(PTE_CACHEABLE | PTE_BUFFERABLE);
-#endif
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+ /* This is an IO map - tell maydump to skip this VMA */
+ vma->vm_flags |= VM_IO;
#elif defined(__sh__)
pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE;
#else
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)