x86, apic: rename 'genapic' to 'apic'

Impact: cleanup

Now that all APIC code is consolidated there's nothing 'gen' about
apics anymore - so rename 'struct genapic' to 'struct apic'.

This shortens the code and is nicer to read as well.

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

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 122d8eda275ffa9e8046387cb697a1ec75b420e4..dce1bf696ccabbf883c27fd01327e1e37384de24 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -248,7 +248,7 @@ static inline void disable_local_APIC(void) { }
  * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and
  * James Cleverdon.
  */
-struct genapic {
+struct apic {
        char *name;
 
        int (*probe)(void);
@@ -283,7 +283,7 @@ struct genapic {
        int (*phys_pkg_id)(int cpuid_apic, int index_msb);
 
        /*
-        * When one of the next two hooks returns 1 the genapic
+        * When one of the next two hooks returns 1 the apic
         * is switched to this. Essentially they are additional
         * probe functions:
         */
@@ -324,7 +324,7 @@ struct genapic {
        u32 (*safe_wait_icr_idle)(void);
 };
 
-extern struct genapic *apic;
+extern struct apic *apic;
 
 static inline u32 apic_read(u32 reg)
 {
@@ -385,17 +385,17 @@ static inline unsigned default_get_apic_id(unsigned long x)
 #define DEFAULT_TRAMPOLINE_PHYS_HIGH           0x469
 
 #ifdef CONFIG_X86_32
-extern void es7000_update_genapic_to_cluster(void);
+extern void es7000_update_apic_to_cluster(void);
 #else
-extern struct genapic apic_flat;
-extern struct genapic apic_physflat;
-extern struct genapic apic_x2apic_cluster;
-extern struct genapic apic_x2apic_phys;
+extern struct apic apic_flat;
+extern struct apic apic_physflat;
+extern struct apic apic_x2apic_cluster;
+extern struct apic apic_x2apic_phys;
 extern int default_acpi_madt_oem_check(char *, char *);
 
 extern void apic_send_IPI_self(int vector);
 
-extern struct genapic apic_x2apic_uv_x;
+extern struct apic apic_x2apic_uv_x;
 DECLARE_PER_CPU(int, x2apic_extra_bits);
 
 extern int default_cpu_present_to_apicid(int mps_cpu);

diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index c230189462a2f048c2a82d6cb037185edfaaaf92..8029369cd6f46a091358e59396f5b978b810258e 100644 (file)
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -30,7 +30,7 @@ struct x86_quirks {
        void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable,
                                unsigned short oemsize);
        int (*setup_ioapic_ids)(void);
-       int (*update_genapic)(void);
+       int (*update_apic)(void);
 };
 
 #endif /* __ASSEMBLY__ */

diff --git a/arch/x86/kernel/bigsmp_32.c b/arch/x86/kernel/bigsmp_32.c
index 17c25bc26a591b771a33e7356d6157ad0957cb41..0b1093394fdf59f1c3a2626002e9c4607343f6c2 100644 (file)
--- a/arch/x86/kernel/bigsmp_32.c
+++ b/arch/x86/kernel/bigsmp_32.c
@@ -210,7 +210,7 @@ static int probe_bigsmp(void)
        return dmi_bigsmp;
 }
 
-struct genapic apic_bigsmp = {
+struct apic apic_bigsmp = {
 
        .name                           = "bigsmp",
        .probe                          = probe_bigsmp,

diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c
index 1d6e99a8edc4f4105262942dff636d1796b09ce1..320f2d2e4e54a5e9eed6a4e01ecd615f8ff21de1 100644 (file)
--- a/arch/x86/kernel/es7000_32.c
+++ b/arch/x86/kernel/es7000_32.c
@@ -163,14 +163,14 @@ static int wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip)
        return 0;
 }
 
-static int __init es7000_update_genapic(void)
+static int __init es7000_update_apic(void)
 {
        apic->wakeup_cpu = wakeup_secondary_cpu_via_mip;
 
        /* MPENTIUMIII */
        if (boot_cpu_data.x86 == 6 &&
            (boot_cpu_data.x86_model >= 7 || boot_cpu_data.x86_model <= 11)) {
-               es7000_update_genapic_to_cluster();
+               es7000_update_apic_to_cluster();
                apic->wait_for_init_deassert = NULL;
                apic->wakeup_cpu = wakeup_secondary_cpu_via_mip;
        }
@@ -193,7 +193,7 @@ static void __init setup_unisys(void)
                es7000_plat = ES7000_CLASSIC;
        ioapic_renumber_irq = es7000_rename_gsi;
 
-       x86_quirks->update_genapic = es7000_update_genapic;
+       x86_quirks->update_apic = es7000_update_apic;
 }
 
 /*
@@ -659,7 +659,7 @@ static int es7000_phys_pkg_id(int cpuid_apic, int index_msb)
        return cpuid_apic >> index_msb;
 }
 
-void __init es7000_update_genapic_to_cluster(void)
+void __init es7000_update_apic_to_cluster(void)
 {
        apic->target_cpus = target_cpus_cluster;
        apic->irq_delivery_mode = dest_LowestPrio;
@@ -691,7 +691,7 @@ es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 }
 
 
-struct genapic apic_es7000 = {
+struct apic apic_es7000 = {
 
        .name                           = "es7000",
        .probe                          = probe_es7000,

diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 91cae6f6e73050c4bd869680a9b788ff2317e94b..70935dd904db41e59b151fda0a912fb68fee11b0 100644 (file)
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -23,16 +23,16 @@
 #include <asm/ipi.h>
 #include <asm/setup.h>
 
-extern struct genapic apic_flat;
-extern struct genapic apic_physflat;
-extern struct genapic apic_x2xpic_uv_x;
-extern struct genapic apic_x2apic_phys;
-extern struct genapic apic_x2apic_cluster;
+extern struct apic apic_flat;
+extern struct apic apic_physflat;
+extern struct apic apic_x2xpic_uv_x;
+extern struct apic apic_x2apic_phys;
+extern struct apic apic_x2apic_cluster;
 
-struct genapic __read_mostly *apic = &apic_flat;
+struct apic __read_mostly *apic = &apic_flat;
 EXPORT_SYMBOL_GPL(apic);
 
-static struct genapic *apic_probe[] __initdata = {
+static struct apic *apic_probe[] __initdata = {
 #ifdef CONFIG_X86_UV
        &apic_x2apic_uv_x,
 #endif
@@ -62,8 +62,8 @@ void __init default_setup_apic_routing(void)
                printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
        }
 
-       if (x86_quirks->update_genapic)
-               x86_quirks->update_genapic();
+       if (x86_quirks->update_apic)
+               x86_quirks->update_apic();
 }
 
 /* Same for both flat and physical. */

diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c
index 27b81208009a0252305af08c811ba97def5b2e9e..3b002995e14577f1a906a3445c52b73027d8dd19 100644 (file)
--- a/arch/x86/kernel/genapic_flat_64.c
+++ b/arch/x86/kernel/genapic_flat_64.c
@@ -178,7 +178,7 @@ static int flat_phys_pkg_id(int initial_apic_id, int index_msb)
        return hard_smp_processor_id() >> index_msb;
 }
 
-struct genapic apic_flat =  {
+struct apic apic_flat =  {
        .name                           = "flat",
        .probe                          = NULL,
        .acpi_madt_oem_check            = flat_acpi_madt_oem_check,
@@ -327,7 +327,7 @@ physflat_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
        return BAD_APICID;
 }
 
-struct genapic apic_physflat =  {
+struct apic apic_physflat =  {
 
        .name                           = "physical flat",
        .probe                          = NULL,

diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c
index b9ef0091c4d729fe0866b1f128a41dba582a0cc5..4e39d9ad4d52a609a84254a0f5d0517d06935205 100644 (file)
--- a/arch/x86/kernel/genx2apic_cluster.c
+++ b/arch/x86/kernel/genx2apic_cluster.c
@@ -182,7 +182,7 @@ static void init_x2apic_ldr(void)
        per_cpu(x86_cpu_to_logical_apicid, cpu) = apic_read(APIC_LDR);
 }
 
-struct genapic apic_x2apic_cluster = {
+struct apic apic_x2apic_cluster = {
 
        .name                           = "cluster x2apic",
        .probe                          = NULL,

diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c
index bb752015776d5b1cb62310669b5a82d2222281d4..d2d52eb9f7eaf738a6c47f3f08bb9adcc5167065 100644 (file)
--- a/arch/x86/kernel/genx2apic_phys.c
+++ b/arch/x86/kernel/genx2apic_phys.c
@@ -168,7 +168,7 @@ static void init_x2apic_ldr(void)
 {
 }
 
-struct genapic apic_x2apic_phys = {
+struct apic apic_x2apic_phys = {
 
        .name                           = "physical x2apic",
        .probe                          = NULL,

diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index dcb8c14287d8e00c3007920240d9172b32cf651a..20b4ad07c3a1f5ec04234bd411c98ce2dddec021 100644 (file)
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@ -240,7 +240,7 @@ static void uv_send_IPI_self(int vector)
        apic_write(APIC_SELF_IPI, vector);
 }
 
-struct genapic apic_x2apic_uv_x = {
+struct apic apic_x2apic_uv_x = {
 
        .name                           = "UV large system",
        .probe                          = NULL,

diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index a709de87819d9a8132dd1d7ecd4a8688061a40a1..d9d6d61eed82d0dd0ec72dd2fe062f688a154ec0 100644 (file)
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -256,7 +256,7 @@ static int __init numaq_setup_ioapic_ids(void)
        return 1;
 }
 
-static int __init numaq_update_genapic(void)
+static int __init numaq_update_apic(void)
 {
        apic->wakeup_cpu = wakeup_secondary_cpu_via_nmi;
 
@@ -278,7 +278,7 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
        .mpc_oem_pci_bus                = mpc_oem_pci_bus,
        .smp_read_mpc_oem               = smp_read_mpc_oem,
        .setup_ioapic_ids               = numaq_setup_ioapic_ids,
-       .update_genapic                 = numaq_update_genapic,
+       .update_apic                    = numaq_update_apic,
 };
 
 static __init void early_check_numaq(void)
@@ -500,7 +500,7 @@ static void numaq_setup_portio_remap(void)
                (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
 }
 
-struct genapic apic_numaq = {
+struct apic apic_numaq = {
 
        .name                           = "NUMAQ",
        .probe                          = probe_numaq,

diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c
index 5914ffb6e408d800beabf5d527f0347435a49c01..5fa48332c5c8359c927b01cb7e14bf5916d65b22 100644 (file)
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -78,7 +78,7 @@ static int probe_default(void)
        return 1;
 }
 
-struct genapic apic_default = {
+struct apic apic_default = {
 
        .name                           = "default",
        .probe                          = probe_default,
@@ -141,16 +141,16 @@ struct genapic apic_default = {
        .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 };
 
-extern struct genapic apic_numaq;
-extern struct genapic apic_summit;
-extern struct genapic apic_bigsmp;
-extern struct genapic apic_es7000;
-extern struct genapic apic_default;
+extern struct apic apic_numaq;
+extern struct apic apic_summit;
+extern struct apic apic_bigsmp;
+extern struct apic apic_es7000;
+extern struct apic apic_default;
 
-struct genapic *apic = &apic_default;
+struct apic *apic = &apic_default;
 EXPORT_SYMBOL_GPL(apic);
 
-static struct genapic *apic_probe[] __initdata = {
+static struct apic *apic_probe[] __initdata = {
 #ifdef CONFIG_X86_NUMAQ
        &apic_numaq,
 #endif
@@ -183,8 +183,8 @@ static int __init parse_apic(char *arg)
                }
        }
 
-       if (x86_quirks->update_genapic)
-               x86_quirks->update_genapic();
+       if (x86_quirks->update_apic)
+               x86_quirks->update_apic();
 
        /* Parsed again by __setup for debug/verbose */
        return 0;
@@ -204,8 +204,8 @@ void __init generic_bigsmp_probe(void)
        if (!cmdline_apic && apic == &apic_default) {
                if (apic_bigsmp.probe()) {
                        apic = &apic_bigsmp;
-                       if (x86_quirks->update_genapic)
-                               x86_quirks->update_genapic();
+                       if (x86_quirks->update_apic)
+                               x86_quirks->update_apic();
                        printk(KERN_INFO "Overriding APIC driver with %s\n",
                               apic->name);
                }
@@ -227,8 +227,8 @@ void __init generic_apic_probe(void)
                if (!apic_probe[i])
                        panic("Didn't find an APIC driver");
 
-               if (x86_quirks->update_genapic)
-                       x86_quirks->update_genapic();
+               if (x86_quirks->update_apic)
+                       x86_quirks->update_apic();
        }
        printk(KERN_INFO "Using APIC driver %s\n", apic->name);
 }
@@ -248,8 +248,8 @@ generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 
                if (!cmdline_apic) {
                        apic = apic_probe[i];
-                       if (x86_quirks->update_genapic)
-                               x86_quirks->update_genapic();
+                       if (x86_quirks->update_apic)
+                               x86_quirks->update_apic();
                        printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                               apic->name);
                }
@@ -270,8 +270,8 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 
                if (!cmdline_apic) {
                        apic = apic_probe[i];
-                       if (x86_quirks->update_genapic)
-                               x86_quirks->update_genapic();
+                       if (x86_quirks->update_apic)
+                               x86_quirks->update_apic();
                        printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                               apic->name);
                }

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index b2da0b1d15e7ac7d3dbaf8cc69d699d8898907a2..6b588d6b38898a64f3aab951be4b556b026e707e 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -599,7 +599,7 @@ static int __init setup_elfcorehdr(char *arg)
 early_param("elfcorehdr", setup_elfcorehdr);
 #endif
 
-static int __init default_update_genapic(void)
+static int __init default_update_apic(void)
 {
 #ifdef CONFIG_SMP
        if (!apic->wakeup_cpu)
@@ -610,7 +610,7 @@ static int __init default_update_genapic(void)
 }
 
 static struct x86_quirks default_x86_quirks __initdata = {
-       .update_genapic         = default_update_genapic,
+       .update_apic         = default_update_apic,
 };
 
 struct x86_quirks *x86_quirks __initdata = &default_x86_quirks;

diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
index 8f1a11b072a7b1cd04fc80f3f90b12ca25bdad68..cfe7b09015d8b57f76ae48caf1e9d1a5fe42e2ea 100644 (file)
--- a/arch/x86/kernel/summit_32.c
+++ b/arch/x86/kernel/summit_32.c
@@ -537,7 +537,7 @@ void __init setup_summit(void)
 }
 #endif
 
-struct genapic apic_summit = {
+struct apic apic_summit = {
 
        .name                           = "summit",
        .probe                          = probe_summit,