Author: jhb Date: Mon Feb 27 17:30:21 2012 New Revision: 232230 URL: http://svn.freebsd.org/changeset/base/232230
Log: Remove completely duplicate '#ifdef XEN' section. Modified: head/sys/i386/include/apicvar.h Modified: head/sys/i386/include/apicvar.h ============================================================================== --- head/sys/i386/include/apicvar.h Mon Feb 27 17:29:42 2012 (r232229) +++ head/sys/i386/include/apicvar.h Mon Feb 27 17:30:21 2012 (r232230) @@ -103,35 +103,6 @@ */ /* Interrupts for local APIC LVT entries other than the timer. */ -#ifdef XEN -/* These are the Xen i386 APIC definitions */ -#define APIC_LOCAL_INTS 240 -#define APIC_ERROR_INT APIC_LOCAL_INTS -#define APIC_THERMAL_INT (APIC_LOCAL_INTS + 1) -#define APIC_CMC_INT (APIC_LOCAL_INTS + 2) -#define APIC_IPI_INTS (APIC_LOCAL_INTS + 3) - -#define IPI_RENDEZVOUS (APIC_IPI_INTS) /* Inter-CPU rendezvous. */ -#define IPI_INVLTLB (APIC_IPI_INTS + 1) /* TLB Shootdown IPIs */ -#define IPI_INVLPG (APIC_IPI_INTS + 2) -#define IPI_INVLRNG (APIC_IPI_INTS + 3) -#define IPI_INVLCACHE (APIC_IPI_INTS + 4) -#define IPI_LAZYPMAP (APIC_IPI_INTS + 5) /* Lazy pmap release. */ -/* Vector to handle bitmap based IPIs */ -#define IPI_BITMAP_VECTOR (APIC_IPI_INTS + 6) - -/* IPIs handled by IPI_BITMAPED_VECTOR (XXX ups is there a better place?) */ -#define IPI_AST 0 /* Generate software trap. */ -#define IPI_PREEMPT 1 -#define IPI_HARDCLOCK 2 -#define IPI_BITMAP_LAST IPI_HARDCLOCK -#define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) - -#define IPI_STOP (APIC_IPI_INTS + 7) /* Stop CPU until restarted. */ -#define IPI_STOP_HARD (APIC_IPI_INTS + 8) /* Stop CPU with a NMI. */ - -#else /* XEN */ -/* These are the normal i386 APIC definitions */ #define APIC_LOCAL_INTS 240 #define APIC_ERROR_INT APIC_LOCAL_INTS #define APIC_THERMAL_INT (APIC_LOCAL_INTS + 1) @@ -156,7 +127,6 @@ #define IPI_STOP (APIC_IPI_INTS + 7) /* Stop CPU until restarted. */ #define IPI_STOP_HARD (APIC_IPI_INTS + 8) /* Stop CPU with a NMI. */ -#endif /* XEN */ /* * The spurious interrupt can share the priority class with the IPIs since _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
