Looks good: Reviewed-by: Christoph Hellwig <hch@xxxxxx> Is it time to deprecate and eventually remove oprofile while we're at it? On Tue, Oct 20, 2020 at 04:31:27PM +0530, Viresh Kumar wrote: > From: Arnd Bergmann <arnd@xxxxxxxx> > > The dcookies stuff is used only with OPROFILE and there is no need to > build it if CONFIG_OPROFILE isn't enabled. Build it depending on > CONFIG_OPROFILE instead of CONFIG_PROFILING. > > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> > [ Viresh: Update the name in #endif part ] > Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> > --- > fs/Makefile | 2 +- > include/linux/dcookies.h | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fs/Makefile b/fs/Makefile > index 7bb2a05fda1f..a7b3d9ff8db5 100644 > --- a/fs/Makefile > +++ b/fs/Makefile > @@ -64,7 +64,7 @@ obj-$(CONFIG_SYSFS) += sysfs/ > obj-$(CONFIG_CONFIGFS_FS) += configfs/ > obj-y += devpts/ > > -obj-$(CONFIG_PROFILING) += dcookies.o > +obj-$(CONFIG_OPROFILE) += dcookies.o > obj-$(CONFIG_DLM) += dlm/ > > # Do not add any filesystems before this line > diff --git a/include/linux/dcookies.h b/include/linux/dcookies.h > index ddfdac20cad0..8617c1871398 100644 > --- a/include/linux/dcookies.h > +++ b/include/linux/dcookies.h > @@ -11,7 +11,7 @@ > #define DCOOKIES_H > > > -#ifdef CONFIG_PROFILING > +#ifdef CONFIG_OPROFILE > > #include <linux/dcache.h> > #include <linux/types.h> > @@ -64,6 +64,6 @@ static inline int get_dcookie(const struct path *path, unsigned long *cookie) > return -ENOSYS; > } > > -#endif /* CONFIG_PROFILING */ > +#endif /* CONFIG_OPROFILE */ > > #endif /* DCOOKIES_H */ > -- > 2.25.0.rc1.19.g042ed3e048af > ---end quoted text---
