From: tip-bot for Randy Dunlap <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: jikos@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org,
rdunlap@infradead.org, tglx@linutronix.de, hch@lst.de,
hpa@zytor.com
Subject: [tip:x86/urgent] x86/APM: Fix build warning when PROC_FS is not enabled
Date: Sat, 15 Sep 2018 01:21:51 -0700 [thread overview]
Message-ID: <tip-002b87d2aace62b4f3841c3aa43309d2380092be@git.kernel.org> (raw)
In-Reply-To: <be39ac12-44c2-4715-247f-4dcc3c525b8b@infradead.org>
Commit-ID: 002b87d2aace62b4f3841c3aa43309d2380092be
Gitweb: https://git.kernel.org/tip/002b87d2aace62b4f3841c3aa43309d2380092be
Author: Randy Dunlap <rdunlap@infradead.org>
AuthorDate: Fri, 14 Sep 2018 15:10:29 -0700
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 15 Sep 2018 10:16:25 +0200
x86/APM: Fix build warning when PROC_FS is not enabled
Fix build warning in apm_32.c when CONFIG_PROC_FS is not enabled:
../arch/x86/kernel/apm_32.c:1643:12: warning: 'proc_apm_show' defined but not used [-Wunused-function]
static int proc_apm_show(struct seq_file *m, void *v)
Fixes: 3f3942aca6da ("proc: introduce proc_create_single{,_data}")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Jiri Kosina <jikos@kernel.org>
Link: https://lkml.kernel.org/r/be39ac12-44c2-4715-247f-4dcc3c525b8b@infradead.org
---
arch/x86/kernel/apm_32.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index ec00d1ff5098..f7151cd03cb0 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1640,6 +1640,7 @@ static int do_open(struct inode *inode, struct file *filp)
return 0;
}
+#ifdef CONFIG_PROC_FS
static int proc_apm_show(struct seq_file *m, void *v)
{
unsigned short bx;
@@ -1719,6 +1720,7 @@ static int proc_apm_show(struct seq_file *m, void *v)
units);
return 0;
}
+#endif
static int apm(void *unused)
{
prev parent reply other threads:[~2018-09-15 8:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-14 22:10 [PTCH] x86: APM: fix build warning when PROC_FS is not enabled Randy Dunlap
2018-09-15 6:54 ` Christoph Hellwig
2018-09-15 8:21 ` tip-bot for Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-002b87d2aace62b4f3841c3aa43309d2380092be@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=jikos@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).