diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2014-07-07 00:27:09 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2014-07-07 00:27:09 +0000 |
| commit | e7d939bda22b07be6b68ba38835c9167212fd56e (patch) | |
| tree | 98db2559cee662a9de7212211dd5c69176b58254 /sys/x86 | |
| parent | 00cf40b0ca010cb2a6afb112650109dcabe80dea (diff) | |
| download | src-e7d939bda22b07be6b68ba38835c9167212fd56e.tar.gz src-e7d939bda22b07be6b68ba38835c9167212fd56e.zip | |
Remove ia64.
This includes:
o All directories named *ia64*
o All files named *ia64*
o All ia64-specific code guarded by __ia64__
o All ia64-specific makefile logic
o Mention of ia64 in comments and documentation
This excludes:
o Everything under contrib/
o Everything under crypto/
o sys/xen/interface
o sys/sys/elf_common.h
Discussed at: BSDcan
Notes
Notes:
svn path=/head/; revision=268351
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/include/segments.h | 6 | ||||
| -rw-r--r-- | sys/x86/iommu/intel_drv.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/x86/include/segments.h b/sys/x86/include/segments.h index 0d6a282c3c8f..a5c1ea46b7b4 100644 --- a/sys/x86/include/segments.h +++ b/sys/x86/include/segments.h @@ -219,7 +219,7 @@ union descriptor { #define IDT_DTRACE_RET 0x92 /* DTrace pid provider Interrupt Vector */ #define IDT_EVTCHN 0x93 /* Xen HVM Event Channel Interrupt Vector */ -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) /* * Entries in the Global Descriptor Table (GDT) * Note that each 4 entries share a single 32 byte L1 cache line. @@ -264,7 +264,7 @@ union descriptor { #define LBSDICALLS_SEL 16 /* BSDI system call gate */ #define NLDT (LBSDICALLS_SEL + 1) -#else /* !__i386__ && !__ia64__ */ +#else /* !__i386__ */ /* * Entries in the Global Descriptor Table (GDT) */ @@ -282,6 +282,6 @@ union descriptor { #define GUSERLDT_SEL 11 /* LDT */ /* slot 12 is second half of GUSERLDT_SEL */ #define NGDT 13 -#endif /* __i386__ || __ia64__ */ +#endif /* __i386__ */ #endif /* !_X86_SEGMENTS_H_ */ diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index ce3f284c32a9..a71c02f2be16 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_acpi.h" -#if defined(__amd64__) /* || defined(__ia64__) */ +#if defined(__amd64__) #define DEV_APIC #else #include "opt_apic.h" |