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

Make acorn26 kernels build again.

Browse Source
This commit is contained in:
matt 2008-06-23 17:58:17 +00:00
parent 362bb1e6c4
commit 29731f5c84
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/acorn26/acorn26/copyinout.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: copyinout.S,v 1.7 2006/08/28 15:15:50 bjh21 Exp $ */
/* $NetBSD: copyinout.S,v 1.8 2008/06/23 17:58:17 matt Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@ -32,7 +32,7 @@
#include <machine/asm.h>
RCSID("$NetBSD: copyinout.S,v 1.7 2006/08/28 15:15:50 bjh21 Exp $")
RCSID("$NetBSD: copyinout.S,v 1.8 2008/06/23 17:58:17 matt Exp $")
#include <sys/errno.h>
#include "assym.h"
@ -98,4 +98,4 @@ Lfusufault:
mov pc, ip
Lcurlwp:
.word _C_LABEL(curlwp)
.word _C_LABEL(cpu_info_store) + CI_CURLWP

9
sys/arch/acorn26/acorn26/cpuswitch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuswitch.c,v 1.15 2007/11/29 14:30:32 ad Exp $ */
/* $NetBSD: cpuswitch.c,v 1.16 2008/06/23 17:58:17 matt Exp $ */
/*
* Copyright (c) 2000 Ben Harris.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpuswitch.c,v 1.15 2007/11/29 14:30:32 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpuswitch.c,v 1.16 2008/06/23 17:58:17 matt Exp $");
#include "opt_lockdebug.h"
@ -55,14 +55,13 @@ __KERNEL_RCSID(0, "$NetBSD: cpuswitch.c,v 1.15 2007/11/29 14:30:32 ad Exp $");
#include <machine/frame.h>
#include <machine/machdep.h>
struct pcb *curpcb;
/*
* Switch to the indicated lwp.
*/
lwp_t *
cpu_switchto(lwp_t *old, lwp_t *new, bool returning)
{
struct cpu_info * const ci = curcpu();
struct proc *p2;
/*
@ -74,7 +73,7 @@ cpu_switchto(lwp_t *old, lwp_t *new, bool returning)
#endif
curlwp = new;
curpcb = &curlwp->l_addr->u_pcb;
ci->ci_curpcb = &curlwp->l_addr->u_pcb;
if ((new->l_flag & LW_SYSTEM) == 0) {
/* Check for Restartable Atomic Sequences. */

7
sys/arch/acorn26/acorn26/except.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: except.c,v 1.20 2008/01/25 21:21:04 chris Exp $ */
/* $NetBSD: except.c,v 1.21 2008/06/23 17:58:17 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
* All rights reserved.
@ -31,7 +31,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.20 2008/01/25 21:21:04 chris Exp $");
__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.21 2008/06/23 17:58:17 matt Exp $");
#include "opt_ddb.h"
@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: except.c,v 1.20 2008/01/25 21:21:04 chris Exp $");
#include <sys/syslog.h>
#include <sys/systm.h>
#include <sys/user.h>
#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
@ -204,7 +205,7 @@ do_fault(struct trapframe *tf, struct lwp *l,
if (pmap_fault(map->pmap, va, atype))
return;
if (curcpu()->ci_idepth != 0) {
if (cpu_intr_p()) {
KASSERT((tf->tf_r15 & R15_MODE) != R15_MODE_USR);
error = EFAULT;
} else

7
sys/arch/acorn26/acorn26/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.9 2007/10/17 19:52:52 garbled Exp $
# $NetBSD: genassym.cf,v 1.10 2008/06/23 17:58:17 matt Exp $
#
# Copyright (c) 1999 Ben Harris
# All rights reserved.
@ -74,3 +74,8 @@ define EFS_RX_FLAGS offsetof(struct eca_fiqstate, efs_rx_flags)
define EFS_RX_MYADDR offsetof(struct eca_fiqstate, efs_rx_myaddr)
define EFS_TX_CURMBUF offsetof(struct eca_fiqstate, efs_tx_curmbuf)
endif
define CI_ASTPENDING offsetof(struct cpu_info, ci_astpending)
define CI_CURLWP offsetof(struct cpu_info, ci_curlwp)
define CI_CURPCB offsetof(struct cpu_info, ci_curpcb)

6
sys/arch/acorn26/acorn26/locore.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.13 2007/10/17 19:52:52 garbled Exp $ */
/* $NetBSD: locore.S,v 1.14 2008/06/23 17:58:17 matt Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 Ben Harris
* Copyright (C) 1994-1997 Mark Brinicombe
@ -185,7 +185,7 @@ pull_trapframe:
movs pc, lr
Lastpending:
.word _C_LABEL(astpending)
.word _C_LABEL(cpu_info_store) + CI_ASTPENDING
.global reset_entry
reset_entry:
mov ip, sp
@ -462,4 +462,4 @@ ENTRY(cpu_Debugger)
ldmfd r13!, {pc}
#endif
RCSID("$NetBSD: locore.S,v 1.13 2007/10/17 19:52:52 garbled Exp $")
RCSID("$NetBSD: locore.S,v 1.14 2008/06/23 17:58:17 matt Exp $")