Commit af669c97 authored by William Lee Irwin III's avatar William Lee Irwin III Committed by Linus Torvalds

i386 bigsmp: section mismatch fixes

  WARNING: arch/i386/mach-generic/built-in.o(.data+0xc4): Section mismatch: reference to .init.text: (between 'apic_bigsmp' and 'cpu.4905')

This appears to be resolvable by removing all the __init and __initdata
qualifiers from arch/i386/mach-generic/bigsmp.c
Signed-off-by: default avatarWilliam Irwin <bill.irwin@oracle.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d3c8bdfb
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
static int dmi_bigsmp; /* can be set by dmi scanners */ static int dmi_bigsmp; /* can be set by dmi scanners */
static __init int hp_ht_bigsmp(struct dmi_system_id *d) static int hp_ht_bigsmp(struct dmi_system_id *d)
{ {
#ifdef CONFIG_X86_GENERICARCH #ifdef CONFIG_X86_GENERICARCH
printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident); printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
...@@ -31,7 +31,7 @@ static __init int hp_ht_bigsmp(struct dmi_system_id *d) ...@@ -31,7 +31,7 @@ static __init int hp_ht_bigsmp(struct dmi_system_id *d)
} }
static struct dmi_system_id __initdata bigsmp_dmi_table[] = { static struct dmi_system_id bigsmp_dmi_table[] = {
{ hp_ht_bigsmp, "HP ProLiant DL760 G2", { { hp_ht_bigsmp, "HP ProLiant DL760 G2", {
DMI_MATCH(DMI_BIOS_VENDOR, "HP"), DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
DMI_MATCH(DMI_BIOS_VERSION, "P44-"), DMI_MATCH(DMI_BIOS_VERSION, "P44-"),
...@@ -45,7 +45,7 @@ static struct dmi_system_id __initdata bigsmp_dmi_table[] = { ...@@ -45,7 +45,7 @@ static struct dmi_system_id __initdata bigsmp_dmi_table[] = {
}; };
static int __init probe_bigsmp(void) static int probe_bigsmp(void)
{ {
if (def_to_bigsmp) if (def_to_bigsmp)
dmi_bigsmp = 1; dmi_bigsmp = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment