x86: rename 'genapic' to 'apic'

Rename genapic-> to apic-> references because in a future chagne we'll
open-code all the indirect calls (instead of obscuring them via macros),
so we want this reference to be as short as possible.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index e656c2721154..2b986389a24f 100644
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -29,7 +29,7 @@ extern struct genapic apic_x2xpic_uv_x;
 extern struct genapic apic_x2apic_phys;
 extern struct genapic apic_x2apic_cluster;
 
-struct genapic __read_mostly *genapic = &apic_flat;
+struct genapic __read_mostly *apic = &apic_flat;
 
 static struct genapic *apic_probe[] __initdata = {
 #ifdef CONFIG_X86_UV
@@ -46,15 +46,15 @@ static struct genapic *apic_probe[] __initdata = {
  */
 void __init setup_apic_routing(void)
 {
-        if (genapic == &apic_x2apic_phys || genapic == &apic_x2apic_cluster) {
+        if (apic == &apic_x2apic_phys || apic == &apic_x2apic_cluster) {
                 if (!intr_remapping_enabled)
-                        genapic = &apic_flat;
+                        apic = &apic_flat;
         }
 
-        if (genapic == &apic_flat) {
+        if (apic == &apic_flat) {
                 if (max_physical_apicid >= 8)
-                        genapic = &apic_physflat;
-                printk(KERN_INFO "Setting APIC routing to %s\n", genapic->name);
+                        apic = &apic_physflat;
+                printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
         }
 
         if (x86_quirks->update_genapic)
@@ -74,9 +74,9 @@ int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 
         for (i = 0; apic_probe[i]; ++i) {
                 if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {
-                        genapic = apic_probe[i];
+                        apic = apic_probe[i];
                         printk(KERN_INFO "Setting APIC routing to %s.\n",
-                                genapic->name);
+                                apic->name);
                         return 1;
                 }
         }