diff options
-rw-r--r-- | sys/alpha/alpha/machdep.c | 4 | ||||
-rw-r--r-- | sys/alpha/include/reg.h | 1 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 3 | ||||
-rw-r--r-- | sys/amd64/include/reg.h | 1 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 3 | ||||
-rw-r--r-- | sys/i386/include/reg.h | 1 | ||||
-rw-r--r-- | sys/ia64/ia64/machdep.c | 3 | ||||
-rw-r--r-- | sys/ia64/include/reg.h | 1 | ||||
-rw-r--r-- | sys/kern/kern_exec.c | 4 | ||||
-rw-r--r-- | sys/pc98/i386/machdep.c | 3 | ||||
-rw-r--r-- | sys/pc98/pc98/machdep.c | 3 | ||||
-rw-r--r-- | sys/powerpc/aim/machdep.c | 3 | ||||
-rw-r--r-- | sys/powerpc/include/reg.h | 1 | ||||
-rw-r--r-- | sys/powerpc/powerpc/machdep.c | 3 | ||||
-rw-r--r-- | sys/sparc64/include/reg.h | 1 | ||||
-rw-r--r-- | sys/sparc64/sparc64/machdep.c | 3 | ||||
-rw-r--r-- | sys/sys/imgact.h | 2 |
17 files changed, 22 insertions, 18 deletions
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 71aaea1..af5e44b 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -97,6 +97,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> +#include <sys/imgact.h> #include <sys/sysproto.h> #include <sys/ktr.h> #include <sys/signalvar.h> @@ -131,7 +132,6 @@ #include <sys/ucontext.h> #include <machine/clock.h> #include <machine/md_var.h> -#include <machine/reg.h> #include <machine/fpu.h> #include <machine/pal.h> #include <machine/cpuconf.h> @@ -1583,7 +1583,7 @@ cpu_halt(void) * Clear registers on exec */ void -setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) +exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *tfp = td->td_frame; diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h index 3ea6143..6e1b1d3 100644 --- a/sys/alpha/include/reg.h +++ b/sys/alpha/include/reg.h @@ -114,7 +114,6 @@ void savefpstate(struct fpreg *); /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs(struct thread *, u_long, u_long, u_long); int fill_regs(struct thread *, struct reg *); int set_regs(struct thread *, struct reg *); int fill_fpregs(struct thread *, struct fpreg *); diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index d699c6e..6cd3bfc 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -55,6 +55,7 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/signalvar.h> +#include <sys/imgact.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/linker.h> @@ -822,7 +823,7 @@ cpu_idle(void) * Clear registers on exec */ void -setregs(td, entry, stack, ps_strings) +exec_setregs(td, entry, stack, ps_strings) struct thread *td; u_long entry; u_long stack; diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h index ca15fb2..a900a9d 100644 --- a/sys/amd64/include/reg.h +++ b/sys/amd64/include/reg.h @@ -143,7 +143,6 @@ struct dbreg { /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs(struct thread *, u_long, u_long, u_long); int fill_regs(struct thread *, struct reg *); int set_regs(struct thread *, struct reg *); int fill_fpregs(struct thread *, struct fpreg *); diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index d699c6e..6cd3bfc 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -55,6 +55,7 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/signalvar.h> +#include <sys/imgact.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/linker.h> @@ -822,7 +823,7 @@ cpu_idle(void) * Clear registers on exec */ void -setregs(td, entry, stack, ps_strings) +exec_setregs(td, entry, stack, ps_strings) struct thread *td; u_long entry; u_long stack; diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h index ca15fb2..a900a9d 100644 --- a/sys/i386/include/reg.h +++ b/sys/i386/include/reg.h @@ -143,7 +143,6 @@ struct dbreg { /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs(struct thread *, u_long, u_long, u_long); int fill_regs(struct thread *, struct reg *); int set_regs(struct thread *, struct reg *); int fill_fpregs(struct thread *, struct fpreg *); diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index ae5612a..69fb171 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -41,6 +41,7 @@ #include <sys/eventhandler.h> #include <sys/sysproto.h> #include <sys/signalvar.h> +#include <sys/imgact.h> #include <sys/kernel.h> #include <sys/proc.h> #include <sys/lock.h> @@ -1095,7 +1096,7 @@ cpu_halt(void) * Clear registers on exec */ void -setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) +exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *frame; diff --git a/sys/ia64/include/reg.h b/sys/ia64/include/reg.h index ac776e1..b2e0604 100644 --- a/sys/ia64/include/reg.h +++ b/sys/ia64/include/reg.h @@ -77,7 +77,6 @@ void savehighfp(struct ia64_fpreg *); /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs(struct thread *, u_long, u_long, u_long); int fill_regs(struct thread *, struct reg *); int set_regs(struct thread *, struct reg *); int fill_fpregs(struct thread *, struct fpreg *); diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 887e75f..5e04c90 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -519,8 +519,8 @@ interpret: (*p->p_sysent->sv_setregs)(td, imgp->entry_addr, (u_long)(uintptr_t)stack_base, imgp->ps_strings); else - setregs(td, imgp->entry_addr, (u_long)(uintptr_t)stack_base, - imgp->ps_strings); + exec_setregs(td, imgp->entry_addr, + (u_long)(uintptr_t)stack_base, imgp->ps_strings); /* Cache arguments if they fit inside our allowance */ if (ps_arg_cache_limit >= i + sizeof(struct pargs)) { diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 03d681d..e5319dd 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -55,6 +55,7 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/signalvar.h> +#include <sys/imgact.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/linker.h> @@ -842,7 +843,7 @@ cpu_idle(void) * Clear registers on exec */ void -setregs(td, entry, stack, ps_strings) +exec_setregs(td, entry, stack, ps_strings) struct thread *td; u_long entry; u_long stack; diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 03d681d..e5319dd 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -55,6 +55,7 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/signalvar.h> +#include <sys/imgact.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/linker.h> @@ -842,7 +843,7 @@ cpu_idle(void) * Clear registers on exec */ void -setregs(td, entry, stack, ps_strings) +exec_setregs(td, entry, stack, ps_strings) struct thread *td; u_long entry; u_long stack; diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 17836fa..a9aa219 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -66,6 +66,7 @@ static const char rcsid[] = #include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> +#include <sys/imgact.h> #include <sys/sysproto.h> #include <sys/lock.h> #include <sys/mutex.h> @@ -841,7 +842,7 @@ cpu_halt(void) * Set set up registers on exec. */ void -setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) +exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *tf; struct ps_strings arginfo; diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h index 9d151d3..e188f02 100644 --- a/sys/powerpc/include/reg.h +++ b/sys/powerpc/include/reg.h @@ -26,7 +26,6 @@ struct dbreg { /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs(struct thread *, u_long, u_long, u_long); int fill_regs(struct thread *, struct reg *); int set_regs(struct thread *, struct reg *); int fill_fpregs(struct thread *, struct fpreg *); diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 17836fa..a9aa219 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -66,6 +66,7 @@ static const char rcsid[] = #include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> +#include <sys/imgact.h> #include <sys/sysproto.h> #include <sys/lock.h> #include <sys/mutex.h> @@ -841,7 +842,7 @@ cpu_halt(void) * Set set up registers on exec. */ void -setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) +exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *tf; struct ps_strings arginfo; diff --git a/sys/sparc64/include/reg.h b/sys/sparc64/include/reg.h index 86cf70a..1878c43 100644 --- a/sys/sparc64/include/reg.h +++ b/sys/sparc64/include/reg.h @@ -74,7 +74,6 @@ struct dbreg { /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs(struct thread *, u_long, u_long, u_long); int fill_regs(struct thread *, struct reg *); int set_regs(struct thread *, struct reg *); int fill_fpregs(struct thread *, struct fpreg *); diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c index 477e5c2..ea83d8c 100644 --- a/sys/sparc64/sparc64/machdep.c +++ b/sys/sparc64/sparc64/machdep.c @@ -46,6 +46,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/cons.h> +#include <sys/imgact.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/linker.h> @@ -600,7 +601,7 @@ ptrace_single_step(struct thread *td) } void -setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) +exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *tf; struct md_utrap *ut; diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index 819ae13..34b091f 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -38,6 +38,7 @@ #define MAXSHELLCMDLEN 128 +struct thread; struct vm_object; struct image_params { @@ -69,6 +70,7 @@ int exec_check_permissions(struct image_params *); int exec_extract_strings(struct image_params *); int exec_new_vmspace(struct image_params *, vm_offset_t, vm_offset_t, vm_offset_t); +void exec_setregs(struct thread *, u_long, u_long, u_long); int exec_shell_imgact(struct image_params *); #endif |