fs: Don't compile in drop_caches.c when CONFIG_SYSCTL=n
Subsystems (4)
PATCH 1/1 fs: Don't compile in drop_caches.c when CONFIG_SYSCTL=n
drop_caches.c provides code only invokable via sysctl, so don't compile it in when CONFIG_SYSCTL=n.
Signed-off-by Josh Triplett <[email protected]>
--- fs/Makefile | 3 ++- include/linux/mm.h | 4 ++++ kernel/sysctl.c | 1 - 3 files changed, 6 insertions(+), 2 deletions(-)
fs/Makefile +2 -1
@@ -10,7 +10,7 @@ obj-y := open.o read_write.o file_table.o super.o \ ioctl.o readdir.o select.o fifo.o dcache.o inode.o \ attr.o bad_inode.o file.o filesystems.o namespace.o \ seq_file.o xattr.o libfs.o fs-writeback.o \ - pnode.o drop_caches.o splice.o sync.o utimes.o \ + pnode.o splice.o sync.o utimes.o \ stack.o fs_struct.o statfs.o ifeq ($(CONFIG_BLOCK),y)
@@ -49,6 +49,7 @@ obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o xattr_acl.o obj-$(CONFIG_NFS_COMMON) += nfs_common/ obj-$(CONFIG_GENERIC_ACL) += generic_acl.o obj-$(CONFIG_COREDUMP) += coredump.o +obj-$(CONFIG_SYSCTL) += drop_caches.o obj-$(CONFIG_FHANDLE) += fhandle.o
include/linux/mm.h +4 -0
@@ -1674,8 +1674,12 @@ int in_gate_area_no_mm(unsigned long addr);#define in_gate_area (mm, addr) ({(void)mm; in_gate_area_no_mm(addr);})#endif /* __HAVE_ARCH_GATE_AREA */ +#ifdef CONFIG_SYSCTL +extern int sysctl_drop_caches;int drop_caches_sysctl_handler (struct ctl_table *,int ,void __user *,size_t *,loff_t *); +#endif +unsigned long shrink_slab (struct shrink_control *shrink,unsigned long nr_pages_scanned,unsigned long lru_pages);
kernel/sysctl.c +0 -1
@@ -106,7 +106,6 @@ extern unsigned int core_pipe_limit;#endif extern int pid_max;extern int pid_max_min, pid_max_max; -extern int sysctl_drop_caches;extern int percpu_pagelist_fraction;extern int compat_log;extern int latencytop_enabled;
Signature · 7 lines
1.7.10.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 4 lines · Josh Triplett
drop_caches.cprovides code only invokable via sysctl, so don't compile it in whenCONFIG_SYSCTL=n.Signed-off-by Josh Triplett <[email protected]>
Seems reasonable to me.
Acked-by Kees Cook <[email protected]>
Signature · 2 lines
Kees Cook Chrome OS Security