Skip to contentSkip to conversation

x86: more section mismatch fixes

PATCH In review Jacek Luczak 3 participants 6 messages Apr 12, 2008 – Apr 13, 2008 x86

lore
Share & tools
lore
#0 lore raw

cover x86: more section mismatch fixes

Hi,

those are patches which fixes some section mismatch stuff in 32-bit part of arch/x86.

@Ingo, I hope that this time everything will be perfect ;-)

-Jacek

#1 lore raw

PATCH 1/3 x86: trampoline_32.S - switch to .cpuinit.data

This patch fixes section mismatch warnings of __cpuinit setup_trampoline() on 32-bit host.

---
 trampoline_32.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/trampoline_32.S +1 -1
index 6458067..d8ccc3c 100644
@@ -33,7 +33,7 @@
 
 /* We can free up trampoline after bootup if cpu hotplug is not supported. */
 #ifndef CONFIG_HOTPLUG_CPU
-.section ".init.data","aw",@progbits
+.section ".cpuinit.data","aw",@progbits
 #else
 .section .rodata,"a",@progbits
 #endif
#2 lore raw

PATCH 2/3 x86: uniq_ioapic_id - fix section mismatch warning

In reply to Jacek Luczak

Fix folowing warning:
WARNING: arch/x86/kernel/built-in.o(.text+0x10799): Section mismatch in reference from the function uniq_ioapic_id()

uniq_ioapic_id() is only used by __init mp_register_ioapic(). Annotate uniq_ioapic_id() with __init.

---
 mpparse.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/mpparse.c +1 -1
index 70744e3..d885f8f 100644
@@ -820,7 +820,7 @@ static int mp_find_ioapic(int gsi)
 	return -1;
 }
 
-static u8 uniq_ioapic_id(u8 id)
+static u8 __init uniq_ioapic_id(u8 id)
 {
 #ifdef CONFIG_X86_32
 	if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) &&
#3 lore raw

PATCH 3/3 x86: unlock_ExtINT_logic() - fix section mismatch warnings

In reply to Jacek Luczak

Fix following warning:
WARNING: arch/x86/kernel/built-in.o(.text+0x12cc9): Section mismatch in reference from the function unlock_ExtINT_logic()

unlock_ExtINT_logic() is only used by __init check_timer(). Annotate unlock_ExtINT_logic() witch __init.

---
 io_apic_32.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/io_apic_32.c +1 -1
index 2e2f420..696b8e4 100644
@@ -2068,7 +2068,7 @@ static void __init setup_nmi(void)
  * cycles as some i82489DX-based boards have glue logic that keeps the
  * 8259A interrupt line asserted until INTA.  --macro
  */
-static inline void unlock_ExtINT_logic(void)
+static inline void __init unlock_ExtINT_logic(void)
 {
 	int apic, pin, i;
 	struct IO_APIC_route_entry entry0, entry1;
#4 lore raw
In reply to Jacek Luczak
Quoted 4 lines · Jacek Luczak

Hi,

those are patches which fixes some section mismatch stuff in 32-bit part of arch/x86.

Hi Jacek.

Thanks for taking your time to look inot these and fix them!

Sam