diff options
author | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
commit | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (patch) | |
tree | 5c66ddaf0a6ab6d898931a5ed58c7aa844b94740 /mm/slub.c | |
parent | 7022b15e2a9f878fd5184586064c63352c3dd225 (diff) | |
parent | 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index d379b782fc8..a505a828ef4 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3762,7 +3762,7 @@ static int any_slab_objects(struct kmem_cache *s) if (!n) continue; - if (atomic_read(&n->total_objects)) + if (atomic_long_read(&n->total_objects)) return 1; } return 0; |