diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
| commit | 6a7fe00e1f5a2e77b777b6e3b90c924c95bfa866 (patch) | |
| tree | 1446c710e4a76d79fe11b1fa01ccb508f0d12d67 /mm/slub.c | |
| parent | ccf1801b089f5575144c4346e4d7d3883a6c9163 (diff) | |
| parent | 8415e604452966f981f20cb4d8a8a30e38a772dd (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlinux-linaro-lsk-v3.10-androidlinux-linaro-lsk-android
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index c34bd44e8be..deaed7b4721 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -4285,7 +4285,13 @@ static ssize_t show_slab_objects(struct kmem_cache *s, page = ACCESS_ONCE(c->partial); if (page) { - x = page->pobjects; + node = page_to_nid(page); + if (flags & SO_TOTAL) + WARN_ON_ONCE(1); + else if (flags & SO_OBJECTS) + WARN_ON_ONCE(1); + else + x = page->pages; total += x; nodes[node] += x; } |