[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240730083158.3583-1-zhangjiao2@cmss.chinamobile.com>
Date: Tue, 30 Jul 2024 16:31:58 +0800
From: zhangjiao2 <zhangjiao2@...s.chinamobile.com>
To: gregkh@...uxfoundation.org
Cc: arnd@...db.de,
linux-kernel@...r.kernel.org,
trivial@...nel.org,
Zhang Jiao <zhangjiao2@...s.chinamobile.com>
Subject: Re: [PATCH v2] char: misc: add missing #ifdef CONFIG_PROC_FS
From: Zhang Jiao <zhangjiao2@...s.chinamobile.com>
Since misc_seq_ops is defined under CONFIG_PROC_FS in this file,
it also need under CONFIG_PROC_FS when use.
>Again, why is a #ifdef ok in this .c file? What changed to suddenly
>require this?
There is another #ifdef in this file, in there "misc_seq_ops" is defined.
If CONFIG_PROC_FS is not defined, proc_create_seq is using an
undefined variable "misc_seq_ops", this may cause compile error.
Signed-off-by: Zhang Jiao <zhangjiao2@...s.chinamobile.com>
---
v1->v2: not check proc_creat_seq returns
drivers/char/misc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 541edc26ec89..e1e8cd09c34a 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -286,9 +286,11 @@ EXPORT_SYMBOL(misc_deregister);
static int __init misc_init(void)
{
int err;
+#ifdef CONFIG_PROC_FS
struct proc_dir_entry *ret;
ret = proc_create_seq("misc", 0, NULL, &misc_seq_ops);
+#endif
err = class_register(&misc_class);
if (err)
goto fail_remove;
@@ -302,8 +304,10 @@ static int __init misc_init(void)
pr_err("unable to get major %d for misc devices\n", MISC_MAJOR);
class_unregister(&misc_class);
fail_remove:
+#ifdef CONFIG_PROC_FS
if (ret)
remove_proc_entry("misc", NULL);
+#endif
return err;
}
subsys_initcall(misc_init);
--
2.33.0
Powered by blists - more mailing lists