Commit be4f1bb2627c2d963d09be1cd69f8820995a9112

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent 9c107805ab

[PATCH] ipmi: fix compile errors with PROC_FS=n

...
  CC [M]  drivers/char/ipmi/ipmi_msghandler.o
drivers/char/ipmi/ipmi_msghandler.c:3301: `proc_ipmi_root' undeclared here (not in a function)
drivers/char/ipmi/ipmi_msghandler.c:3301: initializer element is not constant
drivers/char/ipmi/ipmi_msghandler.c:3301: (near initialization for `__ksymtab_proc_ipmi_root.value')
drivers/char/ipmi/ipmi_msghandler.c:1535: warning: `ipmb_file_read_proc' defined but not used
drivers/char/ipmi/ipmi_msghandler.c:1551: warning: `version_file_read_proc' defined but not used
drivers/char/ipmi/ipmi_msghandler.c:1561: warning: `stat_file_read_proc' defined but not used
...
  CC [M]  drivers/char/ipmi/ipmi_poweroff.o
drivers/char/ipmi/ipmi_poweroff.c: In function `ipmi_poweroff_init':
drivers/char/ipmi/ipmi_poweroff.c:616: warning: implicit declaration of function `unregister_sysctl_table'
drivers/char/ipmi/ipmi_poweroff.c:616: `ipmi_table_header' undeclared (first use in this function)
drivers/char/ipmi/ipmi_poweroff.c:616: (Each undeclared identifier is reported only once
drivers/char/ipmi/ipmi_poweroff.c:616: for each function it appears in.)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 4 additions and 1 deletions Side-by-side Diff

drivers/char/ipmi/ipmi_msghandler.c
... ... @@ -57,6 +57,7 @@
57 57  
58 58 #ifdef CONFIG_PROC_FS
59 59 struct proc_dir_entry *proc_ipmi_root = NULL;
  60 +EXPORT_SYMBOL(proc_ipmi_root);
60 61 #endif /* CONFIG_PROC_FS */
61 62  
62 63 #define MAX_EVENTS_IN_QUEUE 25
... ... @@ -3295,7 +3296,6 @@
3295 3296 EXPORT_SYMBOL(ipmi_set_my_LUN);
3296 3297 EXPORT_SYMBOL(ipmi_get_my_LUN);
3297 3298 EXPORT_SYMBOL(ipmi_smi_add_proc_entry);
3298   -EXPORT_SYMBOL(proc_ipmi_root);
3299 3299 EXPORT_SYMBOL(ipmi_user_set_run_to_completion);
3300 3300 EXPORT_SYMBOL(ipmi_free_recv_msg);
drivers/char/ipmi/ipmi_poweroff.c
... ... @@ -612,11 +612,14 @@
612 612 #endif
613 613  
614 614 rv = ipmi_smi_watcher_register(&smi_watcher);
  615 +
  616 +#ifdef CONFIG_PROC_FS
615 617 if (rv) {
616 618 unregister_sysctl_table(ipmi_table_header);
617 619 printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);
618 620 goto out_err;
619 621 }
  622 +#endif
620 623  
621 624 out_err:
622 625 return rv;