aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/ipmi/ipmi_msghandler.c2
-rw-r--r--drivers/char/ipmi/ipmi_poweroff.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 561430ed94af..0097f06fa67b 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -57,6 +57,7 @@ static int initialized = 0;
57 57
58#ifdef CONFIG_PROC_FS 58#ifdef CONFIG_PROC_FS
59struct proc_dir_entry *proc_ipmi_root = NULL; 59struct proc_dir_entry *proc_ipmi_root = NULL;
60EXPORT_SYMBOL(proc_ipmi_root);
60#endif /* CONFIG_PROC_FS */ 61#endif /* CONFIG_PROC_FS */
61 62
62#define MAX_EVENTS_IN_QUEUE 25 63#define MAX_EVENTS_IN_QUEUE 25
@@ -3295,6 +3296,5 @@ EXPORT_SYMBOL(ipmi_get_my_address);
3295EXPORT_SYMBOL(ipmi_set_my_LUN); 3296EXPORT_SYMBOL(ipmi_set_my_LUN);
3296EXPORT_SYMBOL(ipmi_get_my_LUN); 3297EXPORT_SYMBOL(ipmi_get_my_LUN);
3297EXPORT_SYMBOL(ipmi_smi_add_proc_entry); 3298EXPORT_SYMBOL(ipmi_smi_add_proc_entry);
3298EXPORT_SYMBOL(proc_ipmi_root);
3299EXPORT_SYMBOL(ipmi_user_set_run_to_completion); 3299EXPORT_SYMBOL(ipmi_user_set_run_to_completion);
3300EXPORT_SYMBOL(ipmi_free_recv_msg); 3300EXPORT_SYMBOL(ipmi_free_recv_msg);
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index e053eade0366..49c09ae004bf 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -612,11 +612,14 @@ static int ipmi_poweroff_init (void)
612#endif 612#endif
613 613
614 rv = ipmi_smi_watcher_register(&smi_watcher); 614 rv = ipmi_smi_watcher_register(&smi_watcher);
615
616#ifdef CONFIG_PROC_FS
615 if (rv) { 617 if (rv) {
616 unregister_sysctl_table(ipmi_table_header); 618 unregister_sysctl_table(ipmi_table_header);
617 printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv); 619 printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);
618 goto out_err; 620 goto out_err;
619 } 621 }
622#endif
620 623
621 out_err: 624 out_err:
622 return rv; 625 return rv;