slub: Put objects_show() into CONFIG_SLUB_DEBUG enabled block

The SO_ALL|SO_OBJECTS pair is only used when enabling CONFIG_SLUB_DEBUG
option, so the objects_show() definition should be surrounded by
CONFIG_SLUB_DEBUG too.

Signed-off-by: Xiongwei Song <xiongwei.song@windriver.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/mm/slub.c b/mm/slub.c
index 1202ed1200f96dd35e62e128d9c414007feb7c34..bd3b00bb865bc6c2c38c58a430c5247046ede2e0 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -5612,12 +5612,6 @@ static ssize_t cpu_slabs_show(struct kmem_cache *s, char *buf)
 }
 SLAB_ATTR_RO(cpu_slabs);
 
-static ssize_t objects_show(struct kmem_cache *s, char *buf)
-{
-       return show_slab_objects(s, buf, SO_ALL|SO_OBJECTS);
-}
-SLAB_ATTR_RO(objects);
-
 static ssize_t objects_partial_show(struct kmem_cache *s, char *buf)
 {
        return show_slab_objects(s, buf, SO_PARTIAL|SO_OBJECTS);
@@ -5712,6 +5706,12 @@ static ssize_t total_objects_show(struct kmem_cache *s, char *buf)
 }
 SLAB_ATTR_RO(total_objects);
 
+static ssize_t objects_show(struct kmem_cache *s, char *buf)
+{
+       return show_slab_objects(s, buf, SO_ALL|SO_OBJECTS);
+}
+SLAB_ATTR_RO(objects);
+
 static ssize_t sanity_checks_show(struct kmem_cache *s, char *buf)
 {
        return sysfs_emit(buf, "%d\n", !!(s->flags & SLAB_CONSISTENCY_CHECKS));
@@ -5943,7 +5943,6 @@ static struct attribute *slab_attrs[] = {
        &order_attr.attr,
        &min_partial_attr.attr,
        &cpu_partial_attr.attr,
-       &objects_attr.attr,
        &objects_partial_attr.attr,
        &partial_attr.attr,
        &cpu_slabs_attr.attr,
@@ -5957,6 +5956,7 @@ static struct attribute *slab_attrs[] = {
        &slabs_cpu_partial_attr.attr,
 #ifdef CONFIG_SLUB_DEBUG
        &total_objects_attr.attr,
+       &objects_attr.attr,
        &slabs_attr.attr,
        &sanity_checks_attr.attr,
        &trace_attr.attr,