diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/asm-sparc64 | |
parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r-- | include/asm-sparc64/pgalloc.h | 11 | ||||
-rw-r--r-- | include/asm-sparc64/processor.h | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h index 23603f287..45e1f1828 100644 --- a/include/asm-sparc64/pgalloc.h +++ b/include/asm-sparc64/pgalloc.h @@ -1,4 +1,4 @@ -/* $Id: pgalloc.h,v 1.13 2000/11/06 06:59:04 davem Exp $ */ +/* $Id: pgalloc.h,v 1.14 2000/12/09 04:15:24 anton Exp $ */ #ifndef _SPARC64_PGALLOC_H #define _SPARC64_PGALLOC_H @@ -18,10 +18,15 @@ #define flush_cache_page(vma, page) \ flush_cache_mm((vma)->vm_mm) -/* These operations are unnecessary on the SpitFire since D-CACHE is write-through. */ -#define flush_icache_range(start, end) do { } while (0) +/* This is unnecessary on the SpitFire since D-CACHE is write-through. */ #define flush_page_to_ram(page) do { } while (0) +/* + * icache doesnt snoop local stores and we don't use block commit stores + * (which invalidate icache lines) during module load, so we need this. + */ +extern void flush_icache_range(unsigned long start, unsigned long end); + extern void __flush_dcache_page(void *addr, int flush_icache); #define flush_dcache_page(page) \ do { if ((page)->mapping && !(page)->mapping->i_mmap && !(page)->mapping->i_mmap_shared) \ diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h index eae8b7bdb..562cf4ba8 100644 --- a/include/asm-sparc64/processor.h +++ b/include/asm-sparc64/processor.h @@ -1,4 +1,4 @@ -/* $Id: processor.h,v 1.65 2000/08/09 00:00:17 davem Exp $ +/* $Id: processor.h,v 1.66 2000/11/29 05:56:12 anton Exp $ * include/asm-sparc64/processor.h * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -80,6 +80,7 @@ struct thread_struct { #define SPARC_FLAG_32BIT 0x04 /* task is older 32-bit binary */ #define SPARC_FLAG_NEWCHILD 0x08 /* task is just-spawned child process */ #define SPARC_FLAG_PERFCTR 0x10 /* task has performance counters active */ +#define SPARC_FLAG_MMAPSHARED 0x20 /* task wants a shared mmap */ #define FAULT_CODE_WRITE 0x01 /* Write access, implies D-TLB */ #define FAULT_CODE_DTLB 0x02 /* Miss happened in D-TLB */ |