Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / arch / um / include / tlb.h

diff --git a/arch/um/include/tlb.h b/arch/um/include/tlb.h
index 45d7da6c3b2c5a3eb25715e280e2274e32dcf155..ecd2265b301b06230acb3559e2543ee32594b6fd 100644 (file)
--- a/arch/um/include/tlb.h
+++ b/arch/um/include/tlb.h
@@ -8,39 +8,7 @@
 
 #include "um_mmu.h"
 
-struct host_vm_op {
-       enum { NONE, MMAP, MUNMAP, MPROTECT } type;
-       union {
-               struct {
-                       unsigned long addr;
-                       unsigned long len;
-                       unsigned int r:1;
-                       unsigned int w:1;
-                       unsigned int x:1;
-                       int fd;
-                       __u64 offset;
-               } mmap;
-               struct {
-                       unsigned long addr;
-                       unsigned long len;
-               } munmap;
-               struct {
-                       unsigned long addr;
-                       unsigned long len;
-                       unsigned int r:1;
-                       unsigned int w:1;
-                       unsigned int x:1;
-               } mprotect;
-       } u;
-};
-
-extern void mprotect_kernel_vm(int w);
 extern void force_flush_all(void);
-extern void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
-                             unsigned long end_addr, int force,
-                            int (*do_ops)(union mm_context *,
-                                          struct host_vm_op *, int, int,
-                                          void **));
 extern int flush_tlb_kernel_range_common(unsigned long start,
                                         unsigned long end);