Rik van Riel
2c888cfbc1
thp: fix anon memory statistics with transparent hugepages ...
Count each transparent hugepage as HPAGE_PMD_NR pages in the LRU
statistics, so the Active(anon) and Inactive(anon) statistics in
/proc/meminfo are correct.
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-13 17:32:46 -08:00
Merge branch 'master' into for-next
2010-12-22 18:57:02 +01:00
thp: add pmd mangling generic functions
2011-01-13 17:32:40 -08:00
crypto: padlock - Move padlock.h into include/crypto
2011-01-07 14:52:00 +11:00
Merge branch 'drm-radeon-ni' of ../drm-radeon-next into drm-core-next
2011-01-10 09:27:06 +10:00
thp: fix anon memory statistics with transparent hugepages
2011-01-13 17:32:46 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
Merge branch 'topic/asoc' into for-linus
2011-01-13 08:37:24 +01:00
mm: vmscan: rename lumpy_mode to reclaim_mode
2011-01-13 17:32:34 -08:00
Merge branch 'fbdev/udlfb'
2011-01-06 18:10:09 +09:00
Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-01-12 08:37:35 -08:00
2c888cfbc1