Merge branch 'apic_io'
authorMichael Neumann <mneumann@ntecs.de>
Sun, 7 Nov 2010 18:04:25 +0000 (19:04 +0100)
committerMichael Neumann <mneumann@ntecs.de>
Sun, 7 Nov 2010 18:04:25 +0000 (19:04 +0100)
13 files changed:
1  2 
sys/platform/pc32/acpica5/acpi_machdep.c
sys/platform/pc32/apic/apic_ipl.s
sys/platform/pc32/apic/apic_vector.s
sys/platform/pc32/i386/machdep.c
sys/platform/pc32/i386/mp_machdep.c
sys/platform/pc32/icu/icu_ipl.s
sys/platform/pc32/icu/icu_vector.s
sys/platform/pc32/include/clock.h
sys/platform/pc32/isa/clock.c
sys/platform/pc64/apic/apic_ipl.s
sys/platform/pc64/apic/apic_vector.s
sys/platform/pc64/x86_64/mp_machdep.c
sys/platform/pc64/x86_64/pmap.c

Simple merge
@@@ -352,9 -346,10 +352,9 @@@ Xtimer
  1:
        orl     $RQF_TIMER,PCPU(reqflags)
        MEXITCOUNT
 -      POP_FRAME
 -      iret
 +      jmp     doreti_syscall_ret
  
- #ifdef APIC_IO
+ #ifdef SMP /* APIC-IO */
  
  MCOUNT_LABEL(bintr)
        FAST_INTR(0,apic_fastintr0)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge