On Mon, 24 Jun 2013, Wanpeng Li wrote: > 1 file changed, 10 insertions(+) > > diff --git a/mm/slab_common.c b/mm/slab_common.c > index d161b81..7fdde79 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -631,10 +631,20 @@ static const struct file_operations > proc_slabinfo_operations = { > .release = seq_release, > }; > > +#ifdef CONFIG_SLAB > +static int __init slab_proc_init(void) > +{ > + proc_create("slabinfo", S_IWUSR | S_IRUSR, NULL, > &proc_slabinfo_operations); > + return 0; > +} > +#endif > +#ifdef CONFIG_SLUB > static int __init slab_proc_init(void) > { > proc_create("slabinfo", S_IRUSR, NULL, &proc_slabinfo_operations); > return 0; > }
It may be easier to define a macro SLABINFO_RIGHTS and use #ifdefs to assign the correct one. That way we have only one slab_proc_init(). -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/