diff options
| -rw-r--r-- | sys/kern/init_main.c | 28 | ||||
| -rw-r--r-- | sys/kern/kern_kthread.c | 14 |
2 files changed, 2 insertions, 40 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 30de7afc0b4..697165d9149 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.70 2001/06/27 07:02:45 art Exp $ */ +/* $OpenBSD: init_main.c,v 1.71 2001/06/27 07:16:28 art Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -140,10 +140,6 @@ void start_update __P((void *)); void start_reaper __P((void *)); void start_crypto __P((void *)); -#ifdef cpu_set_init_frame -void *initframep; /* XXX should go away */ -#endif - extern char sigcode[], esigcode[]; #ifdef SYSCALL_DEBUG extern char *syscallnames[]; @@ -407,18 +403,7 @@ main(framep) /* Create process 1 (init(8)). */ if (fork1(p, SIGCHLD, FORK_FORK, NULL, 0, rval)) panic("fork init"); -#ifdef cpu_set_init_frame /* XXX should go away */ - if (rval[1]) { - /* - * Now in process 1. - */ - initframep = framep; - start_init(curproc); - return (0); - } -#else cpu_set_kpc(pfind(rval[0]), start_init, pfind(rval[0])); -#endif /* Create process 2, the pageout daemon kernel thread. */ if (kthread_create(start_pagedaemon, NULL, NULL, "pagedaemon")) @@ -506,17 +491,6 @@ start_init(arg) */ initproc = p; -#ifdef cpu_set_init_frame /* XXX should go away */ - /* - * We need to set the system call frame as if we were entered through - * a syscall() so that when we call sys_execve() below, it will be able - * to set the entry point (see setregs) when it tries to exec. The - * startup code in "locore.s" has allocated space for the frame and - * passed a pointer to that space as main's argument. - */ - cpu_set_init_frame(p, initframep); -#endif - check_console(p); /* diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index dc4c8571952..43cbc1112e0 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_kthread.c,v 1.12 2001/06/27 04:49:42 art Exp $ */ +/* $OpenBSD: kern_kthread.c,v 1.13 2001/06/27 07:16:28 art Exp $ */ /* $NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $ */ /*- @@ -88,22 +88,10 @@ kthread_create(func, arg, newpp, fmt, va_alist) if (error) return (error); -#ifdef cpu_set_init_frame /* XXX should go away */ - if (rv[1]) { - /* - * Now in child. - */ - func(arg); - return (0); - } -#endif - p2 = pfind(rv[0]); -#ifndef cpu_set_init_frame /* XXX should go away */ /* Arrange for it to start at the specified function. */ cpu_set_kpc(p2, func, arg); -#endif /* * Mark it as a system process and not a candidate for |