Merge branch 'apic_io'
authorMichael Neumann <mneumann@ntecs.de>
Sun, 7 Nov 2010 21:43:54 +0000 (22:43 +0100)
committerMichael Neumann <mneumann@ntecs.de>
Sun, 7 Nov 2010 21:43:54 +0000 (22:43 +0100)
Conflicts:
sys/platform/pc64/conf/options

1  2 
sys/config/LINT
sys/config/X86_64_GENERIC
sys/platform/pc64/apic/apic_ipl.s
sys/platform/pc64/apic/apic_vector.s
sys/platform/pc64/conf/options
sys/platform/pc64/icu/icu_vector.s
sys/platform/pc64/include/clock.h
sys/platform/pc64/isa/clock.c
sys/platform/pc64/x86_64/machdep.c
sys/platform/pc64/x86_64/mp_machdep.c
sys/platform/pc64/x86_64/nexus.c

diff --cc sys/config/LINT
Simple merge
Simple merge
Simple merge
@@@ -322,9 -353,9 +322,9 @@@ Xtimer
        orl     $RQF_TIMER,PCPU(reqflags)
        MEXITCOUNT
        APIC_POP_FRAME
 -      iretq
 +      jmp     doreti_iret
  
- #ifdef APIC_IO
+ #ifdef SMP /* APIC-IO */
  
  MCOUNT_LABEL(bintr)
        FAST_INTR(0,apic_fastintr0)
@@@ -12,8 -12,6 +12,7 @@@ I586_PMC_GUPROF               opt_i586_guprof.
  BROKEN_KEYBOARD_RESET opt_reset.h
  
  # x86_64 SMP options
- APIC_IO                       opt_global.h
 +CPU_AMD64X2_INTR_SPAM opt_cpu.h
  
  # The cpu type
  #
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge