The patch titled
Subject: fs: don't compile in drop_caches.c when CONFIG_SYSCTL=n
has been added to the -mm tree. Its filename is
fs-dont-compile-in-drop_cachesc-when-config_sysctl=n.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Subject: 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 <josh@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/Makefile | 3 ++-
include/linux/mm.h | 4 ++++
kernel/sysctl.c | 1 -
3 files changed, 6 insertions(+), 2 deletions(-)
diff -puN fs/Makefile~fs-dont-compile-in-drop_cachesc-when-config_sysctl=n fs/Makefile
--- a/fs/Makefile~fs-dont-compile-in-drop_cachesc-when-config_sysctl=n
+++ a/fs/Makefile
@@ -10,7 +10,7 @@ obj-y := open.o read_write.o file_table.
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.
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
diff -puN include/linux/mm.h~fs-dont-compile-in-drop_cachesc-when-config_sysctl=n include/linux/mm.h
--- a/include/linux/mm.h~fs-dont-compile-in-drop_cachesc-when-config_sysctl=n
+++ a/include/linux/mm.h
@@ -1727,8 +1727,12 @@ int in_gate_area_no_mm(unsigned long add
#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);
diff -puN kernel/sysctl.c~fs-dont-compile-in-drop_cachesc-when-config_sysctl=n kernel/sysctl.c
--- a/kernel/sysctl.c~fs-dont-compile-in-drop_cachesc-when-config_sysctl=n
+++ a/kernel/sysctl.c
@@ -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;
_
Patches currently in -mm which might be from josh@xxxxxxxxxxxxxxxx are
fs-dont-compile-in-drop_cachesc-when-config_sysctl=n.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
