From af39a052ca20440778662b59773d5d376dbb6039 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 28 Apr 2008 02:12:37 -0700
Subject: [PATCH] --- yaml --- r: 94001 b: refs/heads/master c:
 7edf85aa3c00df1e86e82f649c41efa0dd8a7218 h: refs/heads/master i:   93999:
 02a085846f021e9ba7b4740d7d115bfa475865e3 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/mm_types.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 734c889f5e70..524955739659 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5ee5befa75e33e55d34584ad10286c5005cb1de
+refs/heads/master: 7edf85aa3c00df1e86e82f649c41efa0dd8a7218
diff --git a/trunk/include/linux/mm_types.h b/trunk/include/linux/mm_types.h
index af190ceab971..29adaa781cb6 100644
--- a/trunk/include/linux/mm_types.h
+++ b/trunk/include/linux/mm_types.h
@@ -172,6 +172,7 @@ struct mm_struct {
 	atomic_t mm_users;			/* How many users with user space? */
 	atomic_t mm_count;			/* How many references to "struct mm_struct" (users count as 1) */
 	int map_count;				/* number of VMAs */
+	int core_waiters;
 	struct rw_semaphore mmap_sem;
 	spinlock_t page_table_lock;		/* Protects page tables and some counters */
 
@@ -216,11 +217,10 @@ struct mm_struct {
 	unsigned long flags; /* Must use atomic bitops to access the bits */
 
 	/* coredumping support */
-	int core_waiters;
 	struct completion *core_startup_done, core_done;
 
 	/* aio bits */
-	rwlock_t		ioctx_list_lock;
+	rwlock_t		ioctx_list_lock;	/* aio lock */
 	struct kioctx		*ioctx_list;
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
 	struct mem_cgroup *mem_cgroup;