Commit 3542ae4c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

Tweak /proc/ipmi removal

Driver does
	proc_mkdir("ipmi", NULL);
but
	remove_proc_entry(proc_ipmi_root->name, &proc_root);

This is OK and working if only slightly inconsistent.  Also changing
proc_root to NULL will help OpenVZ which has multiple proc roots and, as we
now know, requires matching parents in such cases.
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@sw.ru>
Cc: Corey Minyard <minyard@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 84eb646b
...@@ -4136,7 +4136,7 @@ static __exit void cleanup_ipmi(void) ...@@ -4136,7 +4136,7 @@ static __exit void cleanup_ipmi(void)
del_timer_sync(&ipmi_timer); del_timer_sync(&ipmi_timer);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
remove_proc_entry(proc_ipmi_root->name, &proc_root); remove_proc_entry(proc_ipmi_root->name, NULL);
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
driver_unregister(&ipmidriver); driver_unregister(&ipmidriver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment