Skip to contentSkip to conversation

Add missing ifdef in x86 setup.c

PATCH In review Daniele Venzano 3 participants 3 messages Jan 22, 2009 – Jan 23, 2009

Subsystems (2)
x86 Kernel janitors
lore
Share & tools
lore

Daniele Venzano

author
#0 lore raw

PATCH 1/1 Add missing ifdef in x86 setup.c

The following patch removes a warning generated when the x86 architecture is compitled without CONFIG_X86_RESERVE_LOW_64K. The warning was: ‘dmi_low_memory_corruption’ defined but not used

Patch is against 2.6.28.1

Signed-off-by Daniele Venzano <[email protected]>
arch/x86/kernel/setup.c +2 -0
@@ -738,6 +738,7 @@ void start_periodic_check_for_corruption
 }
 #endif
 
+#ifdef CONFIG_X86_RESERVE_LOW_64K
 static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
 {
 	printk(KERN_NOTICE

@@ -749,6 +750,7 @@ static int __init dmi_low_memory_corrupt
 
 	return 0;
 }
+#endif
 
 /* List of systems that have known low memory corruption BIOS problems */
 static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
#1 lore raw

2009/1/22 Daniele Venzano <[email protected]>:

Quoted 20 lines

The following patch removes a warning generated when the x86 architecture is compitled without CONFIG_X86_RESERVE_LOW_64K. The warning was: 'dmi_low_memory_corruption' defined but not used

Patch is against 2.6.28.1

Signed-off-by Daniele Venzano <[email protected]>
arch/x86/kernel/setup.c 2009-01-22 13:57:39.000000000 +0100 renamed from arch/x86/kernel/setup.c 2009-01-22 13:57:16.000000000 +0100 +1 -0
@@ -738,6 +738,7 @@ void start_periodic_check_for_corruption
 }
 #endif
 
+#ifdef CONFIG_X86_RESERVE_LOW_64K
 static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
 {
       printk(KERN_NOTICE

arch/x86/kernel/setup.c 2009-01-22 13:57:39.000000000 +0100 static int __init dmi_low_memory_corrupt · line 756

Quoted 7 lines
arch/x86/kernel/setup.c 2009-01-22 13:57:39.000000000 +0100 renamed from arch/x86/kernel/setup.c 2009-01-22 13:57:16.000000000 +0100 +1 -0
@@ -749,6 +750,7 @@ static int __init dmi_low_memory_corrupt
 
       return 0;
 }
+#endif
 
 /* List of systems that have known low memory corruption BIOS problems */
 static struct dmi_system_id __initdata bad_bios_dmi_table[] = {

this patch is already in mainline (commit
bb5574608a8375026510b4f983ffbb06ece33fe2 )

my advice, instead of working on 2.6.28.1, try to work on linus' git :
<git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git>

if you are not yet comfortable with git, there's an howto :
<http://linux.yyz.us/git-howto.html>

richard

#2 lore raw
In reply to Daniele Venzano

On Fri, Jan 23, 2009 at 4:31 PM, Richard Genoud
<[email protected]> wrote:
[snip]

Quoted 5 lines

this patch is already in mainline (commit
bb5574608a8375026510b4f983ffbb06ece33fe2 )

my advice, instead of working on 2.6.28.1, try to work on linus' git :
<git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git>

or even with the linux-next tree, to catch stuff before it gets upstream.

see:
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=summary

Quoted 2 lines

if you are not yet comfortable with git, there's an howto :
<http://linux.yyz.us/git-howto.html>

you might want to get your hands on StGit or guilt as well.

Best,
-Hannes