The patch titled
IPMI: fix PROC_FS=n warnings
has been added to the -mm tree. Its filename is
ipmi-fix-proc_fs=n-warnings.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: IPMI: fix PROC_FS=n warnings
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Fix build warnings for PROC_FS=n.
drivers/char/ipmi/ipmi_poweroff.c:707: warning: label 'out_err' defined but not used
drivers/char/ipmi/ipmi_msghandler.c:1774: warning: 'ipmb_file_read_proc' defined but not used
drivers/char/ipmi/ipmi_msghandler.c:1790: warning: 'version_file_read_proc' defined but not used
drivers/char/ipmi/ipmi_msghandler.c:1801: warning: 'stat_file_read_proc' defined but not used
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Corey Minyard <minyard@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/ipmi/ipmi_msghandler.c | 2 ++
drivers/char/ipmi/ipmi_poweroff.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/char/ipmi/ipmi_msghandler.c~ipmi-fix-proc_fs=n-warnings drivers/char/ipmi/ipmi_msghandler.c
--- a/drivers/char/ipmi/ipmi_msghandler.c~ipmi-fix-proc_fs=n-warnings
+++ a/drivers/char/ipmi/ipmi_msghandler.c
@@ -1769,6 +1769,7 @@ int ipmi_request_supply_msgs(ipmi_user_t
-1, 0);
}
+#ifdef CONFIG_PROC_FS
static int ipmb_file_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
{
@@ -1857,6 +1858,7 @@ static int stat_file_read_proc(char *pag
return (out - ((char *) page));
}
+#endif /* CONFIG_PROC_FS */
int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
read_proc_t *read_proc, write_proc_t *write_proc,
diff -puN drivers/char/ipmi/ipmi_poweroff.c~ipmi-fix-proc_fs=n-warnings drivers/char/ipmi/ipmi_poweroff.c
--- a/drivers/char/ipmi/ipmi_poweroff.c~ipmi-fix-proc_fs=n-warnings
+++ a/drivers/char/ipmi/ipmi_poweroff.c
@@ -702,9 +702,9 @@ static int ipmi_poweroff_init (void)
printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);
goto out_err;
}
-#endif
out_err:
+#endif
return rv;
}
_
Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are
origin.patch
git-acpi.patch
git-alsa.patch
alsa-add-struct-forward-declaration.patch
cpufreq-select-consistently-re-2619-rc5-mm1.patch
git-gfs2-nmw.patch
git-ieee1394.patch
git-input.patch
git-mtd.patch
mtd-esb2rom-uses-pci.patch
parisc-fix-module_param-iommu-permission.patch
git-scsi-misc.patch
scsi-advansys-wrap-pci-table-inside-ifdef-config_pci.patch
make-i386-default-to-highmem4g-instead-of-nohighmem.patch
fuse-fix-compile-without-config_block.patch
tifm-fix-null-ptr-and-style.patch
kconfig-printk_time-depends-on-printk.patch
hpfs-fix-printk-format-warnings.patch
declare-smp_call_function_single-in-generic-code.patch
i2o-handle-__copy_from_user.patch
i2o-fix-i2o_config-without-adaptec-extension.patch
parport-section-mismatches-with-hotplug=n.patch
agp-amd64-section-mismatches-with-hotplug=n.patch
ciss-require-same-scsi-module-support.patch
export-toshiba-smm-support-for-neofb-module.patch
kernel-doc-add-fusion-and-i2o-to-kernel-api-book.patch
kernel-doc-fix-fusion-and-i2o-docs.patch
kernel-api-book-remove-videodev-chapter.patch
kernel-doc-stricter-function-pointer-recognition.patch
reporting-bugs-request-config-file.patch
lib-functions-always-build-hweight-for-loadable-modules.patch
ipmi-fix-proc_fs=n-warnings.patch
generic-bug-implementation-handle-bug=n.patch
reiser4-use-null-for-pointers.patch
visws-sgivwfb-is-module-needs-exports.patch
extend-notifier_call_chain-to-count-nr_calls-made-fixes.patch
kvm-fix-null-and-c99-init-sparse-warnings.patch
profile_likely-export-do_check_likely.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
