Andreas Herrmann wrote:
> 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 <[email protected]>
> ---
> include/net/9p/9p.h | 4 ++++
> net/9p/mod.c | 4 ++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
> index 88884d3..f723a03 100644
> --- a/include/net/9p/9p.h
> +++ b/include/net/9p/9p.h
> @@ -412,6 +412,10 @@ int p9_idpool_check(int id, struct p9_idpool *p);
>
> 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);
> +#endif
> +
> #endif /* NET_9P_H */
> diff --git a/net/9p/mod.c b/net/9p/mod.c
> index 4f9e1d2..b4d435c 100644
> --- a/net/9p/mod.c
> +++ b/net/9p/mod.c
> @@ -56,11 +56,13 @@ static int __init init_p9(void)
> return ret;
> }
>
> +#ifdef CONFIG_SYSCTL
> ret = p9_sysctl_register();
> if (ret) {
> printk(KERN_WARNING "9p: registering sysctl failed\n");
> return ret;
> }
> +#endif
>
> return ret;
> }
> @@ -72,7 +74,9 @@ static int __init init_p9(void)
>
> static void __exit exit_p9(void)
> {
> +#ifdef CONFIG_SYSCTL
> p9_sysctl_unregister();
> +#endif
> p9_mux_global_exit();
> }
>
isn't it nicer to do something like this instead?
diff --git a/net/9p/sysctl.c b/net/9p/sysctl.c
index 8b61027..e199865 100644
--- a/net/9p/sysctl.c
+++ b/net/9p/sysctl.c
@@ -68,14 +68,17 @@ static struct ctl_table_header *p9_table_header;
int __init p9_sysctl_register(void)
{
+#ifdef CONFIG_SYSCTL
p9_table_header = register_sysctl_table(p9_ctl_table);
if (!p9_table_header)
return -ENOMEM;
-
+#endif
return 0;
}
void __exit p9_sysctl_unregister(void)
{
+#ifdef CONFIG_SYSCTL
unregister_sysctl_table(p9_table_header);
+#endif
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
