[folded] procfs-use-proper-units-for-nommu-statm-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     procfs-use-proper-units-for-nommu-statm-fix
has been removed from the -mm tree.  Its filename was
     procfs-use-proper-units-for-nommu-statm-fix.patch

This patch was dropped because it was folded into procfs-use-proper-units-for-nommu-statm.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: procfs-use-proper-units-for-nommu-statm-fix
From: Steven J. Magnani <steve@xxxxxxxxxxxxxxx>

Reworked to guarantee page alignment of terms used in data size calculation
and to reduce time spent with mmap_sem held.

Signed-off-by: Steven J. Magnani <steve@xxxxxxxxxxxxxxx>
Cc: Greg Ungerer <gerg@xxxxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/proc/task_nommu.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff -puN fs/proc/task_nommu.c~procfs-use-proper-units-for-nommu-statm-fix fs/proc/task_nommu.c
--- a/fs/proc/task_nommu.c~procfs-use-proper-units-for-nommu-statm-fix
+++ a/fs/proc/task_nommu.c
@@ -110,12 +110,13 @@ int task_statm(struct mm_struct *mm, int
 		}
 	}
 
-	size >>= PAGE_SHIFT;
 	*text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK))
 		>> PAGE_SHIFT;
-	*data = (mm->start_stack - mm->start_data) >> PAGE_SHIFT;
-	size += *text + *data;
+	*data = (PAGE_ALIGN(mm->start_stack) - (mm->start_data & PAGE_MASK))
+		>> PAGE_SHIFT;
 	up_read(&mm->mmap_sem);
+	size >>= PAGE_SHIFT;
+	size += *text + *data;
 	*resident = size;
 	return size;
 }
_

Patches currently in -mm which might be from steve@xxxxxxxxxxxxxxx are

procfs-use-proper-units-for-nommu-statm.patch
procfs-use-proper-units-for-nommu-statm-fix.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux