The patch titled
9p: fix compile error if !CONFIG_SYSCTL
has been added to the -mm tree. Its filename is
9p-fix-compile-error-if-config_sysctl.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: 9p: fix compile error if !CONFIG_SYSCTL
From: Andreas Herrmann <aherrman@xxxxxxxx>
Fix compile error if !CONFIG_SYSCTL:
...
LD .tmp_vmlinux1
net/built-in.o: In function `init_p9':
net/9p/mod.c:59: undefined reference to `p9_sysctl_register'
net/built-in.o: In function `exit_p9':
net/9p/mod.c:75: undefined reference to `p9_sysctl_unregister'
make: *** [.tmp_vmlinux1] Error 1
...
Signed-off-by: Andreas Herrmann <aherrman@xxxxxxxx>
Cc: Eric Van Hensbergen <ericvh@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
9p/mod.c | 0
include/net/9p/9p.h | 11 +++++++++++
2 files changed, 11 insertions(+)
diff -puN include/net/9p/9p.h~9p-fix-compile-error-if-config_sysctl include/net/9p/9p.h
--- a/include/net/9p/9p.h~9p-fix-compile-error-if-config_sysctl
+++ a/include/net/9p/9p.h
@@ -415,6 +415,17 @@ int p9_idpool_check(int id, struct p9_id
int p9_error_init(void);
int p9_errstr2errno(char *, int);
+#ifdef CONFIG_SYSCTL
int __init p9_sysctl_register(void);
void __exit p9_sysctl_unregister(void);
+#else
+static inline int p9_sysctl_register(void)
+{
+ return 0;
+}
+
+static inline void p9_sysctl_unregister(void)
+{
+}
+
#endif /* NET_9P_H */
diff -puN net/9p/mod.c~9p-fix-compile-error-if-config_sysctl net/9p/mod.c
_
Patches currently in -mm which might be from aherrman@xxxxxxxx are
origin.patch
9p-fix-compile-error-if-config_sysctl.patch
mac_hid-fix-build-error-if-mac_emumousebtn-input.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
