x86, apic: clean up ->init_apic_ldr()
- separate the namespace
- remove macros
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 391cc99..7b7fc47 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -75,7 +75,7 @@
.check_apicid_present = bigsmp_check_apicid_present,
.vector_allocation_domain = bigsmp_vector_allocation_domain,
- .init_apic_ldr = init_apic_ldr,
+ .init_apic_ldr = bigsmp_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 6adc3c6..633e848 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -56,7 +56,7 @@
.check_apicid_present = default_check_apicid_present,
.vector_allocation_domain = default_vector_allocation_domain,
- .init_apic_ldr = init_apic_ldr,
+ .init_apic_ldr = default_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index bc1f21c..b70833e 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -24,7 +24,7 @@
apic->irq_delivery_mode = INT_DELIVERY_MODE_CLUSTER;
apic->irq_dest_mode = INT_DEST_MODE_CLUSTER;
- apic->init_apic_ldr = init_apic_ldr_cluster;
+ apic->init_apic_ldr = es7000_init_apic_ldr_cluster;
apic->cpu_mask_to_apicid = cpu_mask_to_apicid_cluster;
}
@@ -117,7 +117,7 @@
.check_apicid_present = es7000_check_apicid_present,
.vector_allocation_domain = es7000_vector_allocation_domain,
- .init_apic_ldr = init_apic_ldr,
+ .init_apic_ldr = es7000_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 712882f..a06fda5 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -62,7 +62,7 @@
.check_apicid_present = numaq_check_apicid_present,
.vector_allocation_domain = numaq_vector_allocation_domain,
- .init_apic_ldr = init_apic_ldr,
+ .init_apic_ldr = numaq_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 1834887..36c552f 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -55,7 +55,7 @@
.check_apicid_present = summit_check_apicid_present,
.vector_allocation_domain = summit_vector_allocation_domain,
- .init_apic_ldr = init_apic_ldr,
+ .init_apic_ldr = summit_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,