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

Let the shark boot again. Fixes port-shark/38929. While I'm here fix the 

splsoft... macros to always raise the IPL (oops!).
This commit is contained in:
rafal 2008-06-11 23:31:35 +00:00
parent 634954287e
commit ba04e43210
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm/arm32/intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.28 2008/04/27 18:58:44 matt Exp $ */
/* $NetBSD: intr.c,v 1.29 2008/06/11 23:31:35 rafal Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.28 2008/04/27 18:58:44 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.29 2008/06/11 23:31:35 rafal Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -69,7 +69,7 @@ set_spl_masks(void)
spl_masks[IPL_VM] = irqmasks[IPL_VM];
spl_masks[IPL_SCHED] = irqmasks[IPL_SCHED];
spl_masks[IPL_HIGH] = irqmasks[IPL_HIGH];
spl_masks[IPL_NONE] = 0;
spl_masks[IPL_NONE] = irqmasks[IPL_NONE];
}

9
sys/arch/arm/include/arm32/psl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: psl.h,v 1.16 2008/04/27 18:58:44 matt Exp $ */
/* $NetBSD: psl.h,v 1.17 2008/06/11 23:31:35 rafal Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@ -54,17 +54,10 @@
*/
#define spl0() splx(IPL_NONE)
#ifdef __HAVE_FAST_SOFTINTS
#define splsoftclock() raisespl(IPL_SOFTCLOCK)
#define splsoftbio() raisespl(IPL_SOFTBIO)
#define splsoftnet() raisespl(IPL_SOFTNET)
#define splsoftserial() raisespl(IPL_SOFTSERIAL)
#else
#define splsoftclock() spl0()
#define splsoftbio() spl0()
#define splsoftnet() spl0()
#define splsoftserial() spl0()
#endif
#define splvm() raisespl(IPL_VM)
#define splsched() raisespl(IPL_SCHED)
#define splhigh() raisespl(IPL_HIGH)

17
sys/arch/shark/shark/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.13 2008/02/12 17:30:58 joerg Exp $ */
/* $NetBSD: autoconf.c,v 1.14 2008/06/11 23:31:35 rafal Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2008/02/12 17:30:58 joerg Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2008/06/11 23:31:35 rafal Exp $");
#include "opt_md.h"
@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2008/02/12 17:30:58 joerg Exp $");
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <arm/arm32/machdep.h>
#include <machine/bootconfig.h>
#include <machine/intr.h>
#include <machine/irqhandler.h>
@ -190,15 +191,9 @@ cpu_configure()
ofrootfound();
#endif
#if defined(DEBUG)
/* Debugging information */
printf("ipl_bio=%08x ipl_net=%08x ipl_tty=%08x ipl_vm=%08x\n",
irqmasks[IPL_BIO], irqmasks[IPL_NET], irqmasks[IPL_TTY],
irqmasks[IPL_VM]);
printf("ipl_audio=%08x ipl_imp=%08x ipl_high=%08x ipl_serial=%08x\n",
irqmasks[IPL_AUDIO], irqmasks[IPL_CLOCK], irqmasks[IPL_HIGH],
irqmasks[IPL_SERIAL]);
#endif /* defined(DEBUG) */
#if defined(DIAGNOSTIC)
dump_spl_masks();
#endif /* defined(DIAGNOSTIC) */
/* Time to start taking interrupts so lets open the flood gates .... */
(void)spl0();