diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 06:40:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 06:40:17 -0700 |
| commit | b3967dc566bc89df19e9aeb87b2fd483418b02e6 (patch) | |
| tree | 97a0fff4c1d59e3395f6b6f9d4a226da3bf58d28 /include/asm-ia64/vga.h | |
| parent | cde227afe6b997dce08bcfc2aa6e373fb56857b0 (diff) | |
| parent | 0ffe984917b9cd6ecc19ffbc06f35869d8c18df8 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Prefetch mmap_sem in ia64_do_page_fault()
[IA64] Failure to resume after INIT in user space
[IA64] Pass more data to the MCA/INIT notify_die hooks
[IA64] always map VGA framebuffer UC, even if it supports WB
[IA64] fix bug in ia64 __mutex_fastpath_trylock
[IA64] for_each_possible_cpu: ia64
[IA64] update HP CSR space discovery via ACPI
[IA64] Wire up new syscalls {set,get}_robust_list
[IA64] 'msg' may be used uninitialized in xpc_initiate_allocate()
[IA64] Wire up new syscall sync_file_range()
Diffstat (limited to 'include/asm-ia64/vga.h')
| -rw-r--r-- | include/asm-ia64/vga.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/vga.h b/include/asm-ia64/vga.h index bc3349ffc50..091177cda22 100644 --- a/include/asm-ia64/vga.h +++ b/include/asm-ia64/vga.h @@ -17,7 +17,7 @@ extern unsigned long vga_console_iobase; extern unsigned long vga_console_membase; -#define VGA_MAP_MEM(x) ((unsigned long) ioremap(vga_console_membase + (x), 0)) +#define VGA_MAP_MEM(x) ((unsigned long) ioremap_nocache(vga_console_membase + (x), 0)) #define vga_readb(x) (*(x)) #define vga_writeb(x,y) (*(y) = (x)) |