Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Garbage-collect cpu_set_init_frame(); it hasn't been needed for some time

Browse Source 
now.
This commit is contained in:
thorpej 1998-01-06 08:06:45 +00:00
parent 07f835de1f
commit c2768af3d4
2 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/m68k/m68k/process_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: process_machdep.c,v 1.17 1996/05/06 20:05:24 gwr Exp $ */
/* $NetBSD: process_machdep.c,v 1.18 1998/01/06 08:06:45 thorpej Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@ -62,9 +62,6 @@
#include <machine/psl.h>
#include <machine/reg.h>
#ifdef cpu_set_init_frame
extern char kstack[]; /* XXX */
#endif
static inline struct frame *process_frame __P((struct proc *p));
static inline struct fpframe *process_fpframe __P((struct proc *p));
@ -74,11 +71,7 @@ process_frame(p)
{
void *ptr;
#ifdef cpu_set_init_frame
ptr = (char *)p->p_addr + ((char *)p->p_md.md_regs - (char *)kstack);
#else
ptr = p->p_md.md_regs;
#endif
return (ptr);
}

37
sys/kern/init_main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: init_main.c,v 1.109 1998/01/05 04:52:48 thorpej Exp $ */
/* $NetBSD: init_main.c,v 1.110 1998/01/06 08:06:47 thorpej Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou. All rights reserved.
@ -126,10 +126,6 @@ static void start_init __P((struct proc *));
static void start_pagedaemon __P((struct proc *));
void main __P((void *));
#ifdef cpu_set_init_frame
void *initframep; /* XXX should go away */
#endif
extern char sigcode[], esigcode[];
#ifdef SYSCALL_DEBUG
extern char *syscallnames[];
@ -366,32 +362,12 @@ main(framep)
/* Create process 1 (init(8)). */
if (sys_fork(p, NULL, 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;
}
#else
cpu_set_kpc(pfind(1), start_init);
#endif
/* Create process 2 (the pageout daemon). */
if (sys_fork(p, NULL, rval))
panic("fork pager");
#ifdef cpu_set_init_frame /* XXX should go away */
if (rval[1]) {
/*
* Now in process 2.
*/
start_pagedaemon(curproc);
}
#else
cpu_set_kpc(pfind(2), start_pagedaemon);
#endif
/* The scheduler is an infinite loop. */
scheduler();
@ -449,17 +425,6 @@ start_init(p)
*/
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
/*
* This is not the right way to do this. We really should
* hand-craft a descriptor onto /dev/console to hand to init,