diff options
| author | Alexey Dobriyan <adobriyan@sw.ru> | 2007-10-17 08:26:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 17:42:51 +0200 |
| commit | 3542ae4c17bb2c86e5658728ff73b3d5ca44532e (patch) | |
| tree | f53e2240dbc0e8f00be21e847e66e729756895af /drivers/char/ipmi | |
| parent | handle the multi-threaded init's exit() properly (diff) | |
| download | linux-3542ae4c17bb2c86e5658728ff73b3d5ca44532e.tar.xz linux-3542ae4c17bb2c86e5658728ff73b3d5ca44532e.zip | |
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: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/ipmi')
| -rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 6a01dd9e43f8..8435fba73daf 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -4136,7 +4136,7 @@ static __exit void cleanup_ipmi(void) del_timer_sync(&ipmi_timer); #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 */ driver_unregister(&ipmidriver); |