From: Michael Neumann <mneumann@ntecs.de>
Date: Sun, 7 Nov 2010 21:43:54 +0000 (+0100)
Subject: Merge branch 'apic_io'
X-Git-Tag: v2.9.1~3
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/c4ce4f88f289f77826fecf470965d7e216274018

Merge branch 'apic_io'

Conflicts:
	sys/platform/pc64/conf/options
---

c4ce4f88f289f77826fecf470965d7e216274018
diff --cc sys/platform/pc64/apic/apic_vector.s
index cb87216955,93f2d62d0d..9fa158daed
--- a/sys/platform/pc64/apic/apic_vector.s
+++ b/sys/platform/pc64/apic/apic_vector.s
@@@ -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)
diff --cc sys/platform/pc64/conf/options
index 2c792628fb,b7e26e167f..93a3c4586b
--- a/sys/platform/pc64/conf/options
+++ b/sys/platform/pc64/conf/options
@@@ -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
  #