lapic: apic_initialize() -> lapic_init()

diff --git a/sys/platform/pc32/apic/mpapic.c b/sys/platform/pc32/apic/mpapic.c
index 61bbc7b..51f6924 100644 (file)
--- a/sys/platform/pc32/apic/mpapic.c
+++ b/sys/platform/pc32/apic/mpapic.c
@@ -124,7 +124,7 @@ static struct ioapic_conf   ioapic_conf;
  * Enable LAPIC, configure interrupts.
  */
 void
-apic_initialize(boolean_t bsp)
+lapic_init(boolean_t bsp)
 {
        uint32_t timer;
        u_int   temp;

diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c
index b45071b..4b41073 100644 (file)
--- a/sys/platform/pc32/i386/mp_machdep.c
+++ b/sys/platform/pc32/i386/mp_machdep.c
@@ -2162,7 +2162,7 @@ start_all_aps(u_int boot_addr)
        POSTCODE(START_ALL_APS_POST);
 
        /* Initialize BSP's local APIC */
-       apic_initialize(TRUE);
+       lapic_init(TRUE);
 
        /* Finalize PIC */
        MachIntrABI.finalize();
@@ -2808,7 +2808,7 @@ ap_init(void)
        }
 
        /* Initialize AP's local APIC for irq's */
-       apic_initialize(FALSE);
+       lapic_init(FALSE);
 
        /* Set memory range attributes for this CPU to match the BSP */
        mem_range_AP_init();

diff --git a/sys/platform/pc32/include/smp.h b/sys/platform/pc32/include/smp.h
index c8b2d6c..ef86c54 100644 (file)
--- a/sys/platform/pc32/include/smp.h
+++ b/sys/platform/pc32/include/smp.h
@@ -149,7 +149,7 @@ extern int                  lapic_id_max;
 
 /* functions in mpapic.c */
 void   apic_dump               (char*);
-void   apic_initialize         (boolean_t);
+void   lapic_init              (boolean_t);
 void   imen_dump               (void);
 int    apic_ipi                (int, int, int);
 void   selected_apic_ipi       (cpumask_t, int, int);

diff --git a/sys/platform/pc64/apic/mpapic.c b/sys/platform/pc64/apic/mpapic.c
index fdeef85..c4a5663 100644 (file)
--- a/sys/platform/pc64/apic/mpapic.c
+++ b/sys/platform/pc64/apic/mpapic.c
@@ -131,7 +131,7 @@ lapic_eoi(void)
  * Enable LAPIC, configure interrupts.
  */
 void
-apic_initialize(boolean_t bsp)
+lapic_init(boolean_t bsp)
 {
        uint32_t timer;
        u_int   temp;

diff --git a/sys/platform/pc64/include/smp.h b/sys/platform/pc64/include/smp.h
index f5027db..1868bfd 100644 (file)
--- a/sys/platform/pc64/include/smp.h
+++ b/sys/platform/pc64/include/smp.h
@@ -160,7 +160,7 @@ extern int                  lapic_id_max;
 
 /* functions in mpapic.c */
 void   apic_dump               (char*);
-void   apic_initialize         (boolean_t);
+void   lapic_init              (boolean_t);
 void   imen_dump               (void);
 int    apic_ipi                (int, int, int);
 void   selected_apic_ipi       (cpumask_t, int, int);

diff --git a/sys/platform/pc64/x86_64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c
index 099e817..96ddde8 100644 (file)
--- a/sys/platform/pc64/x86_64/mp_machdep.c
+++ b/sys/platform/pc64/x86_64/mp_machdep.c
@@ -2159,7 +2159,7 @@ start_all_aps(u_int boot_addr)
        POSTCODE(START_ALL_APS_POST);
 
        /* Initialize BSP's local APIC */
-       apic_initialize(TRUE);
+       lapic_init(TRUE);
 
        /* Finalize PIC */
        MachIntrABI.finalize();
@@ -2799,7 +2799,7 @@ ap_init(void)
        }
 
        /* Initialize AP's local APIC for irq's */
-       apic_initialize(FALSE);
+       lapic_init(FALSE);
 
        /* Set memory range attributes for this CPU to match the BSP */
        mem_range_AP_init();