diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-06-10 18:05:32 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-06-10 18:05:32 +0000 |
| commit | c97f584948035e1a4ccf9be653268e794f1cc4a7 (patch) | |
| tree | 56eeccaecff52fce2182bbffb06eb500c1ee370c /sys/arch/sgi | |
| parent | 679b7378ed7ee80740ab0733174fffb7f28738e4 (diff) | |
Switch sgi to per-process AST, and move ast() from interrupt.c to trap.c
where it can use userret() instead of duplicating it.
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/include/intr.h | 3 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/genassym.cf | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h index dbb721bab9c..3ce4385c50b 100644 --- a/sys/arch/sgi/include/intr.h +++ b/sys/arch/sgi/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.24 2009/05/22 20:37:53 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.25 2009/06/10 18:05:31 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -156,7 +156,6 @@ typedef u_int32_t intrmask_t; /* Type of var holding interrupt mask */ extern volatile intrmask_t cpl; extern volatile intrmask_t ipending; -extern volatile intrmask_t astpending; extern intrmask_t imask[NIPLS]; diff --git a/sys/arch/sgi/sgi/genassym.cf b/sys/arch/sgi/sgi/genassym.cf index d4a0404e4c6..8c68800f0dd 100644 --- a/sys/arch/sgi/sgi/genassym.cf +++ b/sys/arch/sgi/sgi/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.12 2008/04/07 22:30:49 miod Exp $ +# $OpenBSD: genassym.cf,v 1.13 2009/06/10 18:05:31 miod Exp $ # # Copyright (c) 1997 Per Fogelstrom / Opsycon AB # @@ -38,11 +38,10 @@ include <machine/cpu.h> export SONPROC struct proc -#member p_priority member p_stat member p_addr member p_vmspace -#member P_UPTE p_md.md_upte +member P_ASTPENDING p_md.md_astpending member P_PC_CTRL p_md.md_pc_ctrl member P_PC_COUNT p_md.md_pc_count member P_WATCH_1 p_md.md_watch_1 |