Changeset e2ea4ab1 in mainline for kernel/arch/ia32/src/smp/mps.c

Timestamp:

2010-07-02T14:22:35Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

09b859c

Parents:

4d1be48 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ia32/src/smp/mps.c (modified) (5 diffs)

kernel/arch/ia32/src/smp/mps.c

@@ -72 +72 @@
 static size_t l_intr_entry_cnt = 0;
 
-static uint8_t get_cpu_apic_id(size_t i)
+static uint8_t mps_cpu_apic_id(size_t i)
 {
         ASSERT(i < processor_entry_cnt);
@@ -79 +79 @@
 }
 
-static bool is_cpu_enabled(size_t i)
+static bool mps_cpu_enabled(size_t i)
 {
         ASSERT(i < processor_entry_cnt);
@@ -85 +85 @@
         /*
          * FIXME: The current local APIC driver limits usable
-         * APIC IDs to 8.
+         * CPU IDs to 8.
          *
          */
-        if (get_cpu_apic_id(i) > 7)
+        if (i > 7)
                 return false;
         
@@ -94 +94 @@
 }
 
-static bool is_bsp(size_t i)
+static bool mps_cpu_bootstrap(size_t i)
 {
         ASSERT(i < processor_entry_cnt);
@@ -118 +118 @@
  */
 struct smp_config_operations mps_config_operations = {
-        .cpu_enabled = is_cpu_enabled,
-        .cpu_bootstrap = is_bsp,
-        .cpu_apic_id = get_cpu_apic_id,
+        .cpu_enabled = mps_cpu_enabled,
+        .cpu_bootstrap = mps_cpu_bootstrap,
+        .cpu_apic_id = mps_cpu_apic_id,
         .irq_to_pin = mps_irq_to_pin
 };