linux-next: manual merge of the trivial tree with Linus' tree
in [Kernel]
|
Prev: linux-next: manual merge of the mfd tree with the tmio-mmc tree
Next: linux-next: build failure after merge of the scsi-post-merge final tree
From: Stephen Rothwell on 7 Mar 2010 21:30 Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in Documentation/filesystems/proc.txt between commit 34e55232e59f7b19050267a05ff1226e5cd122a5 ("mm: avoid false sharing of mm_counter") from Linus' tree and commit cb2992a60b7e73fbabe9ffe54056eed0022f2ed2 ("doc: typo - Table 1-2 should refer to "status", not "statm"") from the trivial tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc Documentation/filesystems/proc.txt index 96a44dd,bb314f6..0000000 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt @@@ -189,13 -188,7 +189,13 @@@ memory usage. Its seven fields are expl contains details information about the process itself. Its fields are explained in Table 1-4. +(for SMP CONFIG users) +For making accounting scalable, RSS related information are handled in +asynchronous manner and the vaule may not be very precise. To see a precise +snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table. +It's slow but very precise. + - Table 1-2: Contents of the statm files (as of 2.6.30-rc7) + Table 1-2: Contents of the status files (as of 2.6.30-rc7) .............................................................................. Field Content Name filename of the executable -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |