Commit 42e2eb36 authored by David Mosberger's avatar David Mosberger Committed by Linus Torvalds

[PATCH] video console fix up

Here is the last patch for today: it enables writecombined mappings
for ia64 in fbmem.c and gets rid of an ugly ia64 simulator workaround
in vgacon.c which isn't needed anymore.

	--david
parent 8300ed7a
...@@ -616,6 +616,8 @@ fb_mmap(struct file *file, struct vm_area_struct * vma) ...@@ -616,6 +616,8 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
#elif defined(__sh__) #elif defined(__sh__)
pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE; pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE;
#elif defined(__ia64__)
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
#else #else
#warning What do we have to do here?? #warning What do we have to do here??
#endif #endif
......
...@@ -109,14 +109,7 @@ static int vga_can_do_color = 0; /* Do we support colors? */ ...@@ -109,14 +109,7 @@ static int vga_can_do_color = 0; /* Do we support colors? */
static unsigned int vga_default_font_height; /* Height of default screen font */ static unsigned int vga_default_font_height; /* Height of default screen font */
static unsigned char vga_video_type; /* Card type */ static unsigned char vga_video_type; /* Card type */
static unsigned char vga_hardscroll_enabled; static unsigned char vga_hardscroll_enabled;
#ifdef CONFIG_IA64_SOFTSDV_HACKS
/*
* SoftSDV doesn't have hardware assist VGA scrolling
*/
static unsigned char vga_hardscroll_user_enable = 0;
#else
static unsigned char vga_hardscroll_user_enable = 1; static unsigned char vga_hardscroll_user_enable = 1;
#endif
static unsigned char vga_font_is_default = 1; static unsigned char vga_font_is_default = 1;
static int vga_vesa_blanked; static int vga_vesa_blanked;
static int vga_palette_blanked; static int vga_palette_blanked;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment