diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:19:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:19:26 +0200 |
| commit | 9b9b181ce53ef387dfe3df9316bbc641fca13d51 (patch) | |
| tree | acc34cf3d5172536c37de61eafbda399163e4265 /mm | |
| parent | uaccess: fix parameters inversion for __copy_from_user_inatomic() (diff) | |
| parent | Linux 2.6.27-rc7 (diff) | |
| download | linux-9b9b181ce53ef387dfe3df9316bbc641fca13d51.tar.xz linux-9b9b181ce53ef387dfe3df9316bbc641fca13d51.zip | |
Merge commit 'v2.6.27-rc7' into core/locking
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmzone.c | 2 | ||||
| -rw-r--r-- | mm/slub.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mm/mmzone.c b/mm/mmzone.c index 486ed595ee6f..16ce8b955dcf 100644 --- a/mm/mmzone.c +++ b/mm/mmzone.c @@ -69,6 +69,6 @@ struct zoneref *next_zones_zonelist(struct zoneref *z, (z->zone && !zref_in_nodemask(z, nodes))) z++; - *zone = zonelist_zone(z++); + *zone = zonelist_zone(z); return z; } diff --git a/mm/slub.c b/mm/slub.c index fb486d5540f8..0c83e6afe7b2 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1932,6 +1932,7 @@ init_kmem_cache_node(struct kmem_cache_node *n, struct kmem_cache *s) INIT_LIST_HEAD(&n->partial); #ifdef CONFIG_SLUB_DEBUG atomic_long_set(&n->nr_slabs, 0); + atomic_long_set(&n->total_objects, 0); INIT_LIST_HEAD(&n->full); #endif } |