summaryrefslogtreecommitdiff
path: root/arch/i386/mach-generic
diff options
context:
space:
mode:
authorWilliam Lee Irwin III <wli@holomorphy.com>2007-05-23 13:58:23 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-23 20:14:15 -0700
commitaf669c97291c458c97a869bf3c36eb870e7430c1 (patch)
treecdf132f23db4a5dfc5b1511acefec6c4b44a1134 /arch/i386/mach-generic
parentd3c8bdfb931171d6cfd1ec23b2218b0a1f052b95 (diff)
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: William Irwin <bill.irwin@oracle.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/mach-generic')
-rw-r--r--arch/i386/mach-generic/bigsmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/mach-generic/bigsmp.c b/arch/i386/mach-generic/bigsmp.c
index e932d3485ae2..58a477baec30 100644
--- a/arch/i386/mach-generic/bigsmp.c
+++ b/arch/i386/mach-generic/bigsmp.c
@@ -21,7 +21,7 @@
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
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)
}
-static struct dmi_system_id __initdata bigsmp_dmi_table[] = {
+static struct dmi_system_id bigsmp_dmi_table[] = {
{ hp_ht_bigsmp, "HP ProLiant DL760 G2", {
DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
DMI_MATCH(DMI_BIOS_VERSION, "P44-"),
@@ -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)
dmi_bigsmp = 1;