svn commit: r235683 - in head/sys/i386: i386 include

Mitsuru IWASAKI iwasaki at FreeBSD.org
Sun May 20 08:17:21 UTC 2012


Author: iwasaki
Date: Sun May 20 08:17:20 2012
New Revision: 235683
URL: http://svn.freebsd.org/changeset/base/235683

Log:
  Remove cpususpend IDT vector for XEN.
  This broke XEN kernel building.

Modified:
  head/sys/i386/i386/apic_vector.s
  head/sys/i386/include/smp.h

Modified: head/sys/i386/i386/apic_vector.s
==============================================================================
--- head/sys/i386/i386/apic_vector.s	Sun May 20 06:35:22 2012	(r235682)
+++ head/sys/i386/i386/apic_vector.s	Sun May 20 08:17:20 2012	(r235683)
@@ -336,6 +336,7 @@ IDTVEC(cpustop)
 /*
  * Executed by a CPU when it receives an IPI_SUSPEND from another CPU.
  */
+#ifndef XEN
 	.text
 	SUPERALIGN_TEXT
 IDTVEC(cpususpend)
@@ -350,6 +351,7 @@ IDTVEC(cpususpend)
 
 	POP_FRAME
 	jmp	doreti_iret
+#endif
 
 /*
  * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU.

Modified: head/sys/i386/include/smp.h
==============================================================================
--- head/sys/i386/include/smp.h	Sun May 20 06:35:22 2012	(r235682)
+++ head/sys/i386/include/smp.h	Sun May 20 08:17:20 2012	(r235683)
@@ -60,7 +60,9 @@ inthand_t
 /* functions in mp_machdep.c */
 void	cpu_add(u_int apic_id, char boot_cpu);
 void	cpustop_handler(void);
+#ifndef XEN
 void	cpususpend_handler(void);
+#endif
 void	init_secondary(void);
 void	ipi_all_but_self(u_int ipi);
 #ifndef XEN


More information about the svn-src-all mailing list