diff -ur linux-2.4.0-test9.orig/drivers/char/mem.c linux-2.4.0-test9/drivers/char/mem.c --- linux-2.4.0-test9.orig/drivers/char/mem.c Mon Sep 25 15:26:56 2000 +++ linux-2.4.0-test9/drivers/char/mem.c Thu Oct 26 15:31:18 2000 @@ -198,8 +198,12 @@ * through a file pointer that was marked O_SYNC will be * done non-cached. */ - if (noncached_address(offset) || (file->f_flags & O_SYNC)) + if (noncached_address(offset) || (file->f_flags & O_SYNC) || + vma->vm_flags & VM_NONCACHED) vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); + + if (vma->vm_flags & VM_WRITECOMBINED) + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); /* * Don't dump addresses that are not real memory to a core file. diff -ur linux-2.4.0-test9.orig/include/asm-ia64/mman.h linux-2.4.0-test9/include/asm-ia64/mman.h --- linux-2.4.0-test9.orig/include/asm-ia64/mman.h Fri Apr 21 15:21:24 2000 +++ linux-2.4.0-test9/include/asm-ia64/mman.h Thu Oct 26 15:04:01 2000 @@ -24,6 +24,9 @@ #define MAP_LOCKED 0x2000 /* pages are locked */ #define MAP_NORESERVE 0x4000 /* don't check for reservations */ +#define MAP_WRITECOMBINED 0x10000 /* Write combine the area */ +#define MAP_NONCACHED 0x20000 /* Don't cache the memory */ + #define MS_ASYNC 1 /* sync memory asynchronously */ #define MS_INVALIDATE 2 /* invalidate the caches */ #define MS_SYNC 4 /* synchronous memory sync */ diff -ur linux-2.4.0-test9.orig/include/linux/mm.h linux-2.4.0-test9/include/linux/mm.h --- linux-2.4.0-test9.orig/include/linux/mm.h Mon Oct 2 11:01:19 2000 +++ linux-2.4.0-test9/include/linux/mm.h Thu Oct 26 15:30:56 2000 @@ -96,6 +96,9 @@ #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */ #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */ +#define VM_WRITECOMBINED 0x00100000 /* Write combined */ +#define VM_NONCACHED 0x00200000 /* Noncached access */ + #define VM_STACK_FLAGS 0x00000177 #define VM_READHINTMASK (VM_SEQ_READ | VM_RAND_READ) diff -ur linux-2.4.0-test9.orig/mm/mmap.c linux-2.4.0-test9/mm/mmap.c --- linux-2.4.0-test9.orig/mm/mmap.c Tue Aug 29 12:41:12 2000 +++ linux-2.4.0-test9/mm/mmap.c Mon Oct 30 11:01:13 2000 @@ -151,6 +151,12 @@ _trans(prot, PROT_WRITE, VM_WRITE) | _trans(prot, PROT_EXEC, VM_EXEC); flag_bits = +#ifdef MAP_WRITECOMBINED + _trans(flags, MAP_WRITECOMBINED, VM_WRITECOMBINED) | +#endif +#ifdef MAP_NONCACHED + _trans(flags, MAP_NONCACHED, VM_NONCACHED) | +#endif _trans(flags, MAP_GROWSDOWN, VM_GROWSDOWN) | _trans(flags, MAP_DENYWRITE, VM_DENYWRITE) | _trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE);