Skip to contentSkip to conversation

x86: fix compile warning for !CONFIG_X86_RESERVE_LOW_64K builds

PATCH New Simon Holm Thøgersen 1 participant 1 message Oct 13, 2008 x86

lore
Share & tools
lore

Simon Holm Thøgersen

author
#0 lore raw

PATCH 1/1 x86: fix compile warning for !CONFIG_X86_RESERVE_LOW_64K builds

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 <[email protected]>
---
 arch/x86/kernel/setup.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/setup.c +5 -2
index 2255782..dac8325 100644
@@ -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
Signature · 1 line
1.5.6.2.255.gbed62