Changeset f619ec11 in mainline for kernel/arch/ia32xen/src/smp/apic.c

Timestamp:

2007-02-03T21:26:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cf5ddf6

Parents:

80bcaed

Message:

When clock() is called by an external interrupt dispatched by the IRQ dispatcher,
no spinlock can be held or the kernel will not be preemptive. This fixes Ticket #24.

Formating and indentation fixes.

File:

• kernel/arch/ia32xen/src/smp/apic.c (modified) (7 diffs)

kernel/arch/ia32xen/src/smp/apic.c

@@ -152 +152 @@
          */
         idreg.value = io_apic_read(IOAPICID);
-        if ((1<<idreg.apic_id) & apic_id_mask) {        /* see if IO APIC ID is used already */
+        if ((1 << idreg.apic_id) & apic_id_mask) {      /* see if IO APIC ID is used already */
                 for (i = 0; i < APIC_ID_COUNT; i++) {
                         if (!((1<<i) & apic_id_mask)) {
@@ -303 +303 @@
                  * If this is not 82489DX-based l_apic we must send two STARTUP IPI's.
                  */
-                for (i = 0; i<2; i++) {
+                for (i = 0; i < 2; i++) {
                         icr.lo = l_apic[ICRlo];
                         icr.delmod = DELMOD_STARTUP;
@@ -402 +402 @@
         /* Program Logical Destination Register. */
         ldr.value = l_apic[LDR];
-        if (CPU->id < sizeof(CPU->id)*8)        /* size in bits */
-                ldr.id = (1<<CPU->id);
+        if (CPU->id < sizeof(CPU->id) * 8)      /* size in bits */
+                ldr.id = (1 << CPU->id);
         l_apic[LDR] = ldr.value;
         
@@ -508 +508 @@
                 dlvr = DELMOD_LOWPRI;
 
-        reg.lo = io_apic_read(IOREDTBL + pin*2);
-        reg.hi = io_apic_read(IOREDTBL + pin*2 + 1);
+        reg.lo = io_apic_read(IOREDTBL + pin * 2);
+        reg.hi = io_apic_read(IOREDTBL + pin * 2 + 1);
         
         reg.dest = dest;
@@ -518 +518 @@
         reg.intvec = v;
 
-        io_apic_write(IOREDTBL + pin*2, reg.lo);
-        io_apic_write(IOREDTBL + pin*2 + 1, reg.hi);
+        io_apic_write(IOREDTBL + pin * 2, reg.lo);
+        io_apic_write(IOREDTBL + pin * 2 + 1, reg.hi);
 }
 
@@ -540 +540 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin*2);
+                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
                                 reg.masked = true;
                                 io_apic_write(IOREDTBL + pin*2, reg.lo);
@@ -567 +567 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin*2);
+                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
                                 reg.masked = false;
                                 io_apic_write(IOREDTBL + pin*2, reg.lo);