diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:30:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:30:06 -0800 |
| commit | 3ea86172d8f6ae13a896f78ec3f029bb410eacf2 (patch) | |
| tree | 72346dfc1ca3054384f3e790a65729e7bbe900d3 /mm/page_alloc.c | |
| parent | 595cf06fad2068ed3e97caabbb92ebe71ffd97d9 (diff) | |
v2.4.13.7 -> v2.4.13.8
- Andrea: fix races in do_wp_page, free_swap_and_cache
- me: clena up page dirty handling
- Tim Waugh: parport IRQ probing and documentation fixes
- Greg KH: USB updates
- Michael Warfield: computone driver update
- Randy Dunlap: add knowledge about some new io-apics
- Richard Henderson: alpha updates
- Trond Myklebust: make readdir xdr verify the reply packet
- Paul Mackerras: PPC update
- Jens Axboe: make cpqarray and cciss play nice with the request layer
- Massimo Dal Zotto: SMM driver for Dell Inspiron 8000
- Richard Gooch: devfs symlink deadlock fix
- Anton Altaparmakov: make NTFS compile on sparc
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5418504b0eab..ef2b8fc9b23a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -515,14 +515,14 @@ void show_free_areas_core(pg_data_t *pgdat) pg_data_t *tmpdat = pgdat; printk("Free pages: %6dkB (%6dkB HighMem)\n", - nr_free_pages() << (PAGE_SHIFT-10), - nr_free_highpages() << (PAGE_SHIFT-10)); + K(nr_free_pages()), + K(nr_free_highpages())); while (tmpdat) { zone_t *zone; for (zone = tmpdat->node_zones; zone < tmpdat->node_zones + MAX_NR_ZONES; zone++) - printk("Zone:%s freepages:%6lukB min:%6luKB low:%6lukB " + printk("Zone:%s freepages:%6lukB min:%6lukB low:%6lukB " "high:%6lukB\n", zone->name, K(zone->free_pages), @@ -533,10 +533,6 @@ void show_free_areas_core(pg_data_t *pgdat) tmpdat = tmpdat->node_next; } - printk("Free pages: %6dkB (%6dkB HighMem)\n", - K(nr_free_pages()), - K(nr_free_highpages())); - printk("( Active: %d, inactive: %d, free: %d )\n", nr_active_pages, nr_inactive_pages, @@ -561,8 +557,7 @@ void show_free_areas_core(pg_data_t *pgdat) nr++; } total += nr * (1 << order); - printk("%lu*%lukB ", nr, - (PAGE_SIZE>>10) << order); + printk("%lu*%lukB ", nr, K(1UL) << order); } spin_unlock_irqrestore(&zone->lock, flags); } |