aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-01 08:12:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-01 08:12:39 -0700
commit0d262424b07582a3aa3afa85af645bd436a94a39 (patch)
tree4ec3c7034bb244515904c6866642fdc9a9a4b39a /include
parent9f29333dae3488542b1344871e8ecb84084ad80e (diff)
parentc9f2946fbec88d4baa3a6d47eb3a8e6b08b05cd9 (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.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc64/tlbflush.h b/include/asm-sparc64/tlbflush.h
index 9ad5d9c51d4..e3a7c453b50 100644
--- a/include/asm-sparc64/tlbflush.h
+++ b/include/asm-sparc64/tlbflush.h
@@ -22,8 +22,6 @@ extern void flush_tlb_pending(void);
/* Local cpu only. */
extern void __flush_tlb_all(void);
-extern void __flush_tlb_page(unsigned long context, unsigned long page, unsigned long r);
-
extern void __flush_tlb_kernel_range(unsigned long start, unsigned long end);
#ifndef CONFIG_SMP