summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2014-07-07 00:27:09 +0000
committermarcel <marcel@FreeBSD.org>2014-07-07 00:27:09 +0000
commit9f28abd980752efcf77578cd494f1015083c2a2b (patch)
tree98db2559cee662a9de7212211dd5c69176b58254 /sys/kern
parent43f783bfcf60b349841acd57895767177114e4ae (diff)
downloadFreeBSD-src-9f28abd980752efcf77578cd494f1015083c2a2b.zip
FreeBSD-src-9f28abd980752efcf77578cd494f1015083c2a2b.tar.gz
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
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/imgact_elf.c4
-rw-r--r--sys/kern/kern_exec.c9
-rw-r--r--sys/kern/kern_thread.c2
-rw-r--r--sys/kern/link_elf.c19
-rw-r--r--sys/kern/subr_witness.c3
5 files changed, 3 insertions, 34 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index b085a70..6342119 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -130,7 +130,7 @@ SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO,
__XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": enable non-executable stack");
#if __ELF_WORD_SIZE == 32
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
int i386_read_exec = 0;
SYSCTL_INT(_kern_elf32, OID_AUTO, read_exec, CTLFLAG_RW, &i386_read_exec, 0,
"enable execution from readable segments");
@@ -2112,7 +2112,7 @@ __elfN(trans_prot)(Elf_Word flags)
if (flags & PF_R)
prot |= VM_PROT_READ;
#if __ELF_WORD_SIZE == 32
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
if (i386_read_exec && (flags & PF_R))
prot |= VM_PROT_EXECUTE;
#endif
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index bc9af29..860820a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1091,15 +1091,6 @@ exec_new_vmspace(imgp, sv)
if (error)
return (error);
-#ifdef __ia64__
- /* Allocate a new register stack */
- stack_addr = IA64_BACKINGSTORE;
- error = vm_map_stack(map, stack_addr, (vm_size_t)ssiz,
- sv->sv_stackprot, VM_PROT_ALL, MAP_STACK_GROWS_UP);
- if (error)
- return (error);
-#endif
-
/*
* vm_ssize and vm_maxsaddr are somewhat antiquated concepts, but they
* are still used to enforce the stack rlimit on the process stack.
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index b21a4f0..3f95371 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -234,7 +234,7 @@ thread_fini(void *mem, int size)
* For a newly created process,
* link up all the structures and its initial threads etc.
* called from:
- * {arch}/{arch}/machdep.c ia64_init(), init386() etc.
+ * {arch}/{arch}/machdep.c {arch}_init(), init386() etc.
* proc_dtor() (should go away)
* proc_init()
*/
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 631ba75..ecee5a7 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -317,10 +317,6 @@ link_elf_delete_gdb(struct link_map *l)
}
#endif /* GDB */
-#ifdef __ia64__
-Elf_Addr link_elf_get_gp(linker_file_t);
-#endif
-
/*
* The kernel symbol table starts here.
*/
@@ -1454,21 +1450,6 @@ link_elf_each_function_nameval(linker_file_t file,
return (0);
}
-#ifdef __ia64__
-/*
- * Each KLD has its own GP. The GP value for each load module is given by
- * DT_PLTGOT on ia64. We need GP to construct function descriptors, but
- * don't have direct access to the ELF file structure. The link_elf_get_gp()
- * function returns the GP given a pointer to a generic linker file struct.
- */
-Elf_Addr
-link_elf_get_gp(linker_file_t lf)
-{
- elf_file_t ef = (elf_file_t)lf;
- return ((Elf_Addr)ef->got);
-}
-#endif
-
const Elf_Sym *
elf_get_sym(linker_file_t lf, Elf_Size symidx)
{
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 4ba4cf1..8d25461 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -660,9 +660,6 @@ static struct witness_order_list_entry order_lists[] = {
{ "mprof lock", &lock_class_mtx_spin },
{ "zombie lock", &lock_class_mtx_spin },
{ "ALD Queue", &lock_class_mtx_spin },
-#ifdef __ia64__
- { "MCA spin lock", &lock_class_mtx_spin },
-#endif
#if defined(__i386__) || defined(__amd64__)
{ "pcicfg", &lock_class_mtx_spin },
{ "NDIS thread lock", &lock_class_mtx_spin },
OpenPOWER on IntegriCloud