diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-09-11 15:44:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-09-11 15:44:20 +0000 |
| commit | 97591430ce787f738611b19ae7bc9a8867beba7c (patch) | |
| tree | 172292b22becc2cae0ca46b4568b1950f03be0b8 /sys/compat | |
| parent | ee649a97d7c357cdc8b0523bdc8d8976eb8ea859 (diff) | |
Remove the 'OLF method' used for the transition from a.out to ELF and
for all the compat layers which are now gone. Linux compat still works
because it always used another method in any case, and nothing looks at
p_os anymore.
ok jsing
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/linux/linux_exec.c | 7 | ||||
| -rw-r--r-- | sys/compat/linux/linux_exec.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/compat/linux/linux_exec.c b/sys/compat/linux/linux_exec.c index c587445b246..22d0b2f424b 100644 --- a/sys/compat/linux/linux_exec.c +++ b/sys/compat/linux/linux_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_exec.c,v 1.36 2012/06/20 11:37:21 pirofti Exp $ */ +/* $OpenBSD: linux_exec.c,v 1.37 2012/09/11 15:44:19 deraadt Exp $ */ /* $NetBSD: linux_exec.c,v 1.13 1996/04/05 00:01:10 christos Exp $ */ /*- @@ -42,7 +42,6 @@ #include <sys/core.h> #include <sys/exec.h> #include <sys/exec_elf.h> -#include <sys/exec_olf.h> #include <sys/mman.h> #include <sys/syscallargs.h> @@ -473,7 +472,7 @@ exec_linux_elf32_makecmds(struct proc *p, struct exec_package *epp) int linux_elf_probe(struct proc *p, struct exec_package *epp, char *itp, - u_long *pos, u_int8_t *os) + u_long *pos) { Elf32_Ehdr *eh = epp->ep_hdr; char *bp, *brand; @@ -513,8 +512,6 @@ recognized: } epp->ep_emul = &emul_linux_elf; *pos = ELF32_NO_ADDR; - if (*os == OOS_NULL) - *os = OOS_LINUX; mtx_init(&futex_lock, IPL_NONE); futex_pool_init(); diff --git a/sys/compat/linux/linux_exec.h b/sys/compat/linux/linux_exec.h index d4f0f14d2e1..b216205a5a6 100644 --- a/sys/compat/linux/linux_exec.h +++ b/sys/compat/linux/linux_exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_exec.h,v 1.7 2011/04/05 22:54:30 pirofti Exp $ */ +/* $OpenBSD: linux_exec.h,v 1.8 2012/09/11 15:44:19 deraadt Exp $ */ /* $NetBSD: linux_exec.h,v 1.5 1995/10/07 06:27:01 mycroft Exp $ */ /* @@ -70,6 +70,6 @@ int exec_linux_aout_makecmds(struct proc *, struct exec_package *); int exec_linux_elf32_makecmds(struct proc *, struct exec_package *); int linux_elf_probe(struct proc *, struct exec_package *, char *, - u_long *, u_int8_t *); + u_long *); #endif /* !_LINUX_EXEC_H_ */ |