This makes sure printk format strings contain no more than a single
line.
Signed-off-by: Vegard Nossum <[EMAIL PROTECTED]>
---
mm/page_alloc.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 1a8c595..96f0b33 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -198,13 +198,15 @@ static inline int bad_range(struct zone *zone, struct
page *page)
static void bad_page(struct page *page)
{
- printk(KERN_EMERG "Bad page state in process '%s'\n"
- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d
count:%d\n"
- KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
- KERN_EMERG "Backtrace:\n",
- current->comm, page, (int)(2*sizeof(unsigned long)),
- (unsigned long)page->flags, page->mapping,
+ printk(KERN_EMERG "Bad page state in process '%s'\n", current->comm);
+ printk(KERN_EMERG
+ "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
+ page, (int) (2 * sizeof(unsigned long)),
+ (unsigned long) page->flags, page->mapping,
page_mapcount(page), page_count(page));
+ printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n");
+ printk(KERN_EMERG "Backtrace:\n");
+
dump_stack();
page->flags &= ~(1 << PG_lru |
1 << PG_private |
@@ -1575,13 +1577,13 @@ void show_free_areas(void)
}
}
- printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n"
- " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
+ printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n",
global_page_state(NR_ACTIVE),
global_page_state(NR_INACTIVE),
global_page_state(NR_FILE_DIRTY),
global_page_state(NR_WRITEBACK),
- global_page_state(NR_UNSTABLE_NFS),
+ global_page_state(NR_UNSTABLE_NFS));
+ printk(" free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
global_page_state(NR_FREE_PAGES),
global_page_state(NR_SLAB_RECLAIMABLE) +
global_page_state(NR_SLAB_UNRECLAIMABLE),
--
1.5.2.4
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
