Commit be4f1bb2 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Corey Minyard <minyard@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9c107805

drivers/char/ipmi/ipmi_msghandler.c

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static int initialized = 0; 


#ifdef CONFIG_PROC_FS

struct proc_dir_entry *proc_ipmi_root = NULL;

EXPORT_SYMBOL(proc_ipmi_root);

#endif /* CONFIG_PROC_FS */



#define MAX_EVENTS_IN_QUEUE	25
@@ -3295,6 +3296,5 @@ EXPORT_SYMBOL(ipmi_get_my_address); 
EXPORT_SYMBOL(ipmi_set_my_LUN);

EXPORT_SYMBOL(ipmi_get_my_LUN);

EXPORT_SYMBOL(ipmi_smi_add_proc_entry);

EXPORT_SYMBOL(proc_ipmi_root);

EXPORT_SYMBOL(ipmi_user_set_run_to_completion);

EXPORT_SYMBOL(ipmi_free_recv_msg);

drivers/char/ipmi/ipmi_poweroff.c

+3 −0
Original line number Diff line number Diff line
@@ -612,11 +612,14 @@ static int ipmi_poweroff_init (void) 
#endif



	rv = ipmi_smi_watcher_register(&smi_watcher);



#ifdef CONFIG_PROC_FS

	if (rv) {

		unregister_sysctl_table(ipmi_table_header);

		printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);

		goto out_err;

	}

#endif



 out_err:

	return rv;