Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/arch/um/include/tlb.h b/arch/um/include/tlb.h
index 45d7da6c3b2c5a3eb25715e280e2274e32dcf155..bcd1a4afb842af26ee54c1dd873af4e75d05db36 100644 (file)
--- a/arch/um/include/tlb.h
+++ b/arch/um/include/tlb.h
@@ -14,9 +14,7 @@ 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;
                        int fd;
                        __u64 offset;
                } mmap;
@@ -27,14 +25,11 @@ 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,