diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 11:12:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 11:12:39 -0400 |
| commit | 0d262424b07582a3aa3afa85af645bd436a94a39 (patch) | |
| tree | 4ec3c7034bb244515904c6866642fdc9a9a4b39a /include | |
| parent | 9f29333dae3488542b1344871e8ecb84084ad80e (diff) | |
| parent | c9f2946fbec88d4baa3a6d47eb3a8e6b08b05cd9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Disable preemption during flush_tlb_pending().
[SPARC64]: Kill __flush_tlb_page() prototype.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/tlbflush.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc64/tlbflush.h b/include/asm-sparc64/tlbflush.h index 9ad5d9c51d42..e3a7c453b500 100644 --- a/include/asm-sparc64/tlbflush.h +++ b/include/asm-sparc64/tlbflush.h | |||
| @@ -22,8 +22,6 @@ extern void flush_tlb_pending(void); | |||
| 22 | /* Local cpu only. */ | 22 | /* Local cpu only. */ |
| 23 | extern void __flush_tlb_all(void); | 23 | extern void __flush_tlb_all(void); |
| 24 | 24 | ||
| 25 | extern void __flush_tlb_page(unsigned long context, unsigned long page, unsigned long r); | ||
| 26 | |||
| 27 | extern void __flush_tlb_kernel_range(unsigned long start, unsigned long end); | 25 | extern void __flush_tlb_kernel_range(unsigned long start, unsigned long end); |
| 28 | 26 | ||
| 29 | #ifndef CONFIG_SMP | 27 | #ifndef CONFIG_SMP |