Commit b76146ed1ae7d7acae1d51f9342e31d00c8d5a12
Committed by
Linus Torvalds
Linus Torvalds
1 parent
5c36fe3d87
Exists in
master
and in
20 other branches
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>
Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff
mm/page_alloc.c
| ... | ... | @@ -2183,7 +2183,7 @@ |
| 2183 | 2183 | printk("active_anon:%lu inactive_anon:%lu isolated_anon:%lu\n" |
| 2184 | 2184 | " active_file:%lu inactive_file:%lu isolated_file:%lu\n" |
| 2185 | 2185 | " unevictable:%lu" |
| 2186 | - " dirty:%lu writeback:%lu unstable:%lu buffer:%lu\n" | |
| 2186 | + " dirty:%lu writeback:%lu unstable:%lu\n" | |
| 2187 | 2187 | " free:%lu slab_reclaimable:%lu slab_unreclaimable:%lu\n" |
| 2188 | 2188 | " mapped:%lu shmem:%lu pagetables:%lu bounce:%lu\n", |
| 2189 | 2189 | global_page_state(NR_ACTIVE_ANON), |
| ... | ... | @@ -2196,7 +2196,6 @@ |
| 2196 | 2196 | global_page_state(NR_FILE_DIRTY), |
| 2197 | 2197 | global_page_state(NR_WRITEBACK), |
| 2198 | 2198 | global_page_state(NR_UNSTABLE_NFS), |
| 2199 | - nr_blockdev_pages(), | |
| 2200 | 2199 | global_page_state(NR_FREE_PAGES), |
| 2201 | 2200 | global_page_state(NR_SLAB_RECLAIMABLE), |
| 2202 | 2201 | global_page_state(NR_SLAB_UNRECLAIMABLE), |