Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index b6f51e3a38ec..ff2e09c953b9 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -298,8 +298,9 @@ struct mm_struct {
                                 unsigned long addr, unsigned long len,
                                 unsigned long pgoff, unsigned long flags);
         void (*unmap_area) (struct mm_struct *mm, unsigned long addr);
-        unsigned long mmap_base;                /* base of mmap area */
-        unsigned long cached_hole_size;         /* if non-zero, the largest hole below free_area_cache */
+        unsigned long mmap_base;                /* base of mmap area */
+        unsigned long task_size;                /* size of task vm space */
+        unsigned long cached_hole_size;         /* if non-zero, the largest hole below free_area_cache */
         unsigned long free_area_cache;          /* first hole of size cached_hole_size or larger */
         pgd_t * pgd;
         atomic_t mm_users;                      /* How many users with user space? */