Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / arch / um / include / tlb.h

diff --git a/arch/um/include/tlb.h b/arch/um/include/tlb.h
index c6f9628f39bfd159a87df0dd19c07053b536142e..bcd1a4afb842af26ee54c1dd873af4e75d05db36 100644 (file)
--- a/arch/um/include/tlb.h
+++ b/arch/um/include/tlb.h
@@ -9,14 +9,12 @@
 #include "um_mmu.h"
 
 struct host_vm_op {
-       enum { MMAP, MUNMAP, MPROTECT } type;
+       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;
+                       unsigned int prot;
                        int fd;
                        __u64 offset;
                } mmap;
@@ -27,35 +25,18 @@ struct host_vm_op {
                struct {
                        unsigned long addr;
                        unsigned long len;
-                       unsigned int r:1;
-                       unsigned int w:1;
-                       unsigned int x:1;
+                       unsigned int prot;
                } 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,
-                             void (*do_ops)(union mm_context *,
-                                            struct host_vm_op *, int));
+                            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);
 
-extern int add_mmap(unsigned long virt, unsigned long phys, unsigned long len,
-                   int r, int w, int x, struct host_vm_op *ops, int index,
-                    int last_filled, union mm_context *mmu,
-                    void (*do_ops)(union mm_context *, struct host_vm_op *,
-                                   int));
-extern int add_munmap(unsigned long addr, unsigned long len,
-                     struct host_vm_op *ops, int index, int last_filled,
-                      union mm_context *mmu,
-                      void (*do_ops)(union mm_context *, struct host_vm_op *,
-                                     int));
-extern int add_mprotect(unsigned long addr, unsigned long len, int r, int w,
-                       int x, struct host_vm_op *ops, int index,
-                        int last_filled, union mm_context *mmu,
-                        void (*do_ops)(union mm_context *, struct host_vm_op *,
-                                       int));
 #endif