Skip to contentSkip to conversation

x86: apic/es7000_32.c find_unisys_acpi_oem_table and es7000_acpi_madt_oem_check should use __init

PATCH-tip Jaswinder Singh Rajput 1 participant 1 message Apr 16, 2009 x86

lore
Share & tools
lore
#0 lore raw

Impact: fix sections mismatch warnings
WARNING: arch/x86/built-in.o(.text+0x65e67): Section mismatch in reference from the function find_unisys_acpi_oem_table() to the function .init.text:__acpi_map_table() The function find_unisys_acpi_oem_table() references
the function __init __acpi_map_table().
This is often because find_unisys_acpi_oem_table lacks a __init
annotation or the annotation of __acpi_map_table is wrong.

WARNING: arch/x86/built-in.o(.text+0x65f98): Section mismatch in reference from the function es7000_acpi_madt_oem_check() to the function .init.text:__acpi_unmap_table() The function es7000_acpi_madt_oem_check() references
the function __init __acpi_unmap_table().
This is often because es7000_acpi_madt_oem_check lacks a __init
annotation or the annotation of __acpi_unmap_table is wrong.

---
 arch/x86/kernel/apic/es7000_32.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/es7000_32.c +3 -3
index 1c11b81..a7a7bbe 100644
@@ -254,7 +254,7 @@ static int parse_unisys_oem(char *oemptr)
 }
 
 #ifdef CONFIG_ACPI
-static int find_unisys_acpi_oem_table(unsigned long *oem_addr)
+static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)
 {
 	struct acpi_table_header *header = NULL;
 	struct es7000_oem_table *table;
@@ -306,7 +306,7 @@ static int es7000_check_dsdt(void)
 static int es7000_acpi_ret;
 
 /* Hook from generic ACPI tables.c */
-static int es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
 	unsigned long oem_addr = 0;
 	int check_dsdt;
@@ -717,7 +717,7 @@ struct apic apic_es7000_cluster = {
 	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,
 };
 
-struct apic apic_es7000 = {
+struct apic __initdata apic_es7000 = {
 
 	.name				= "es7000",
 	.probe				= probe_es7000,
Signature · 1 line
1.6.0.6