From: "Simon Holm Thøgersen" <odie@cs.aau.dk>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: fix compile warning for !CONFIG_X86_RESERVE_LOW_64K builds
Date: Tue, 14 Oct 2008 01:01:24 +0200 [thread overview]
Message-ID: <1223938884.21717.22.camel@odie.local> (raw)
This fixes the following compile warning for !CONFIG_X86_RESERVE_LOW_64K builds
arch/x86/kernel/setup.c:736: warning: 'dmi_low_memory_corruption' defined but not used
that was introduced by fc381519 (x86: add X86_RESERVE_LOW_64K).
Signed-off-by: Simon Holm Thøgersen <odie@cs.aau.dk>
---
arch/x86/kernel/setup.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 2255782..dac8325 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -732,6 +732,7 @@ void start_periodic_check_for_corruption(void)
}
#endif
+#ifdef CONFIG_X86_RESERVE_LOW_64K
static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
{
printk(KERN_NOTICE
@@ -746,7 +747,6 @@ static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
/* List of systems that have known low memory corruption BIOS problems */
static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
-#ifdef CONFIG_X86_RESERVE_LOW_64K
{
.callback = dmi_low_memory_corruption,
.ident = "AMI BIOS",
@@ -761,9 +761,12 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
},
},
-#endif
{}
};
+#else
+static struct dmi_system_id __initdata bad_bios_dmi_table[] = {{}};
+#endif
+
/*
* Determine if we were loaded by an EFI loader. If so, then we have also been
--
1.5.6.2.255.gbed62
reply other threads:[~2008-10-13 22:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1223938884.21717.22.camel@odie.local \
--to=odie@cs.aau.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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