From 95db6b748fc86297827fbd9c9ef174d491c9ad89 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 16 Feb 2000 01:07:24 +0000
Subject: Merge with Linux 2.3.40.

---
 include/linux/mm.h | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'include/linux/mm.h')

diff --git a/include/linux/mm.h b/include/linux/mm.h
index a05d74bd8..d5daeba2c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -44,7 +44,7 @@ struct vm_area_struct {
 	struct vm_area_struct *vm_next;
 
 	pgprot_t vm_page_prot;
-	unsigned short vm_flags;
+	unsigned long vm_flags;
 
 	/* AVL tree of VM areas per task, sorted by address */
 	short vm_avl_height;
@@ -66,26 +66,26 @@ struct vm_area_struct {
 /*
  * vm_flags..
  */
-#define VM_READ		0x0001	/* currently active flags */
-#define VM_WRITE	0x0002
-#define VM_EXEC		0x0004
-#define VM_SHARED	0x0008
-
-#define VM_MAYREAD	0x0010	/* limits for mprotect() etc */
-#define VM_MAYWRITE	0x0020
-#define VM_MAYEXEC	0x0040
-#define VM_MAYSHARE	0x0080
-
-#define VM_GROWSDOWN	0x0100	/* general info on the segment */
-#define VM_GROWSUP	0x0200
-#define VM_SHM		0x0400	/* shared memory area, don't swap out */
-#define VM_DENYWRITE	0x0800	/* ETXTBSY on write attempts.. */
-
-#define VM_EXECUTABLE	0x1000
-#define VM_LOCKED	0x2000
-#define VM_IO           0x4000  /* Memory mapped I/O or similar */
-
-#define VM_STACK_FLAGS	0x0177
+#define VM_READ		0x00000001	/* currently active flags */
+#define VM_WRITE	0x00000002
+#define VM_EXEC		0x00000004
+#define VM_SHARED	0x00000008
+
+#define VM_MAYREAD	0x00000010	/* limits for mprotect() etc */
+#define VM_MAYWRITE	0x00000020
+#define VM_MAYEXEC	0x00000040
+#define VM_MAYSHARE	0x00000080
+
+#define VM_GROWSDOWN	0x00000100	/* general info on the segment */
+#define VM_GROWSUP	0x00000200
+#define VM_SHM		0x00000400	/* shared memory area, don't swap out */
+#define VM_DENYWRITE	0x00000800	/* ETXTBSY on write attempts.. */
+
+#define VM_EXECUTABLE	0x00001000
+#define VM_LOCKED	0x00002000
+#define VM_IO           0x00004000  /* Memory mapped I/O or similar */
+
+#define VM_STACK_FLAGS	0x00000177
 
 /*
  * mapping from the currently active vm_flags protection bits (the
-- 
cgit v1.2.3