diff --git a/[refs] b/[refs] index d3fe45655e31..9cfd9f646007 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d20bbfab01802e195a50435940f7e4aa747c217c +refs/heads/master: ab067e99d22ec78ff646de1283348729d1aa66d4 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 5bfc2047afe1..708efe886154 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -4579,7 +4579,7 @@ static const struct file_operations proc_slabstats_operations = { static int __init slab_proc_init(void) { - proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); + proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations); #ifdef CONFIG_DEBUG_SLAB_LEAK proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations); #endif diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 3b3f17bc0d17..943f4906131b 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -4386,11 +4386,12 @@ struct slab_attribute { }; #define SLAB_ATTR_RO(_name) \ - static struct slab_attribute _name##_attr = __ATTR_RO(_name) + static struct slab_attribute _name##_attr = \ + __ATTR(_name, 0400, _name##_show, NULL) #define SLAB_ATTR(_name) \ static struct slab_attribute _name##_attr = \ - __ATTR(_name, 0644, _name##_show, _name##_store) + __ATTR(_name, 0600, _name##_show, _name##_store) static ssize_t slab_size_show(struct kmem_cache *s, char *buf) { @@ -5231,7 +5232,7 @@ static const struct file_operations proc_slabinfo_operations = { static int __init slab_proc_init(void) { - proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations); + proc_create("slabinfo", S_IRUSR, NULL, &proc_slabinfo_operations); return 0; } module_init(slab_proc_init);