Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28947
b: refs/heads/master
c: 8f9de51
h: refs/heads/master
i:
  28945: d6d10f7
  28943: 654a55d
v: v3
  • Loading branch information
Kirill Korotaev authored and Linus Torvalds committed Jun 23, 2006
1 parent 5403536 commit 4503504
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d501e62bc7796e90b0312648e23ac39490dfbf87
refs/heads/master: 8f9de51a4a98ba32f839903b7d009788bc2c295d
9 changes: 5 additions & 4 deletions trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ void show_free_areas(void)
}

for_each_zone(zone) {
unsigned long nr, flags, order, total = 0;
unsigned long nr[MAX_ORDER], flags, order, total = 0;

show_node(zone);
printk("%s: ", zone->name);
Expand All @@ -1502,11 +1502,12 @@ void show_free_areas(void)

spin_lock_irqsave(&zone->lock, flags);
for (order = 0; order < MAX_ORDER; order++) {
nr = zone->free_area[order].nr_free;
total += nr << order;
printk("%lu*%lukB ", nr, K(1UL) << order);
nr[order] = zone->free_area[order].nr_free;
total += nr[order] << order;
}
spin_unlock_irqrestore(&zone->lock, flags);
for (order = 0; order < MAX_ORDER; order++)
printk("%lu*%lukB ", nr[order], K(1UL) << order);
printk("= %lukB\n", K(total));
}

Expand Down

0 comments on commit 4503504

Please sign in to comment.