The following commit has been merged in the linux branch: commit b76146ed1ae7d7acae1d51f9342e31d00c8d5a12 Author: Andrew Morton akpm@linux-foundation.org Date: Mon Oct 26 16:49:52 2009 -0700

revert "mm: oom analysis: add buffer cache information to show_free_areas()"

Revert

commit 71de1ccbe1fb40203edd3beb473f8580d917d2ca Author: KOSAKI Motohiro kosaki.motohiro@jp.fujitsu.com AuthorDate: Mon Sep 21 17:01:31 2009 -0700 Commit: Linus Torvalds torvalds@linux-foundation.org CommitDate: Tue Sep 22 07:17:27 2009 -0700

mm: oom analysis: add buffer cache information to show_free_areas()

show_free_areas() is called during page allocation failures, and page allocation failures can occur in any calling context.

But nr_blockdev_pages() takes VFS locks which should not be taken from hard IRQ context (at least). The result is lockdep warnings (and deadlockability) during page allocation failures.

Cc: KOSAKI Motohiro kosaki.motohiro@jp.fujitsu.com Cc: Wu Fengguang fengguang.wu@intel.com Cc: Rik van Riel riel@redhat.com Cc: David Rientjes rientjes@google.com Cc: Alexey Dobriyan adobriyan@gmail.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bf72055..cdcedf6 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2183,7 +2183,7 @@ void show_free_areas(void) printk("active_anon:%lu inactive_anon:%lu isolated_anon:%lu\n" " active_file:%lu inactive_file:%lu isolated_file:%lu\n" " unevictable:%lu" - " dirty:%lu writeback:%lu unstable:%lu buffer:%lu\n" + " dirty:%lu writeback:%lu unstable:%lu\n" " free:%lu slab_reclaimable:%lu slab_unreclaimable:%lu\n" " mapped:%lu shmem:%lu pagetables:%lu bounce:%lu\n", global_page_state(NR_ACTIVE_ANON), @@ -2196,7 +2196,6 @@ void show_free_areas(void) global_page_state(NR_FILE_DIRTY), global_page_state(NR_WRITEBACK), global_page_state(NR_UNSTABLE_NFS), - nr_blockdev_pages(), global_page_state(NR_FREE_PAGES), global_page_state(NR_SLAB_RECLAIMABLE), global_page_state(NR_SLAB_UNRECLAIMABLE),