consistency.

5c596bb3 · kaashoek · 5cb7877e · 5c596bb3 · 5c596bb3
--- a/ioapic.c
+++ b/ioapic.c
@@ -37,7 +37,9 @@ ioapic_init(void)
  uchar id;
  int i;

-  if (ismp) {
+  if (!ismp)
+    return;
+
  io = (struct ioapic*) IO_APIC_BASE;
  l = ioapic_read(io, IOAPIC_VER);
  nintr =  ((l & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1;
@@ -61,7 +63,6 @@ ioapic_init(void)
    h &= ~IOART_DEST;
    ioapic_write(io, IOAPIC_REDTBL_HI(i), h);
  }
-  }
 }

 void
@@ -70,7 +71,9 @@ ioapic_enable (int irq, int cpunum)
  uint l, h;
  struct ioapic *io;
  
-  if (ismp) {
+  if (!ismp)
+    return;
+
  io = (struct ioapic*) IO_APIC_BASE;
  l = ioapic_read(io, IOAPIC_REDTBL_LO(irq));
  l = l & ~IOART_INTMASK;  // allow INTs
@@ -79,5 +82,4 @@ ioapic_enable (int irq, int cpunum)
  h &= ~IOART_DEST;
  h |= (cpunum << APIC_ID_SHIFT);
  ioapic_write(io, IOAPIC_REDTBL_HI(irq), h);
-  }
 }
--- a/lapic.c
+++ b/lapic.c
@@ -105,13 +105,14 @@ lapic_write(int r, int data)
 void
 lapic_timerinit(void)
 {
-  if (lapicaddr) {
+  if (!lapicaddr) 
+    return;
+
  lapic_write(LAPIC_TDCR, LAPIC_X1);
  lapic_write(LAPIC_TIMER, LAPIC_CLKIN | LAPIC_PERIODIC |
 	      (IRQ_OFFSET + IRQ_TIMER));
  lapic_write(LAPIC_TCCR, 10000000);
  lapic_write(LAPIC_TICR, 10000000);
-  }
 }

 void
@@ -126,7 +127,7 @@ lapic_init(int c)
 {
  uint r, lvt;

-  if (lapicaddr == 0) 
+  if (!lapicaddr) 
    return;

  lapic_write(LAPIC_DFR, 0xFFFFFFFF);    // Set dst format register