Remove all references to spl_mask. Now it isn't used by any sources.
Discussed on port-arm.
This commit is contained in:
tsutsui
parent
908dae93e8
commit
320e4f3fc5
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rpc_machdep.c,v 1.65 2006/10/24 21:03:13 bjh21 Exp $ */
|
||||
/* $NetBSD: rpc_machdep.c,v 1.66 2007/08/13 02:04:50 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000-2002 Reinoud Zandijk.
|
||||
@ -54,7 +54,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.65 2006/10/24 21:03:13 bjh21 Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.66 2007/08/13 02:04:50 tsutsui Exp $");
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
@ -234,7 +234,6 @@ extern void dumpsys(void);
|
||||
|
||||
/* NOTE: These variables will be removed, well some of them */
|
||||
|
||||
extern u_int spl_mask;
|
||||
extern u_int current_mask;
|
||||
|
||||
void
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: eb7500atx_machdep.c,v 1.6 2006/10/24 21:03:13 bjh21 Exp $ */
|
||||
/* $NetBSD: eb7500atx_machdep.c,v 1.7 2007/08/13 02:04:50 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000-2002 Reinoud Zandijk.
|
||||
@ -54,7 +54,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.6 2006/10/24 21:03:13 bjh21 Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.7 2007/08/13 02:04:50 tsutsui Exp $");
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
@ -234,7 +234,6 @@ extern void dumpsys(void);
|
||||
|
||||
/* NOTE: These variables will be removed, well some of them */
|
||||
|
||||
extern u_int spl_mask;
|
||||
extern u_int current_mask;
|
||||
|
||||
void
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: intr.c,v 1.22 2007/08/04 16:31:21 tsutsui Exp $ */
|
||||
/* $NetBSD: intr.c,v 1.23 2007/08/13 02:04:50 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
@ -36,7 +36,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.22 2007/08/04 16:31:21 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.23 2007/08/13 02:04:50 tsutsui Exp $");
|
||||
|
||||
#include "opt_irqstats.h"
|
||||
|
||||
@ -58,8 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.22 2007/08/04 16:31:21 tsutsui Exp $");
|
||||
|
||||
extern int current_spl_level;
|
||||
|
||||
extern unsigned spl_mask;
|
||||
|
||||
/* Generate soft interrupt counts if IRQSTATS is defined */
|
||||
/* Prototypes */
|
||||
static void clearsoftintr(u_int);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: spl.S,v 1.4 2002/08/17 16:36:34 thorpej Exp $ */
|
||||
/* $NetBSD: spl.S,v 1.5 2007/08/13 02:04:50 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996-1998 Mark Brinicombe.
|
||||
@ -48,12 +48,6 @@
|
||||
.Lcurrent_spl_level:
|
||||
.word _C_LABEL(current_spl_level)
|
||||
|
||||
.Lspl_masks:
|
||||
.word _C_LABEL(spl_masks)
|
||||
|
||||
.Lspl_mask:
|
||||
.word _C_LABEL(spl_mask)
|
||||
|
||||
ENTRY(raisespl)
|
||||
mov r3, r0 /* Save the new value */
|
||||
ldr r1, .Lcurrent_spl_level /* Get the current spl level */
|
||||
@ -63,12 +57,6 @@ ENTRY(raisespl)
|
||||
|
||||
str r3, [r1] /* Store the new spl level */
|
||||
|
||||
ldr r2, .Lspl_masks /* Get the spl mask */
|
||||
ldr r2, [r2, r3, lsl #2]
|
||||
|
||||
ldr r1, .Lspl_mask /* Store in the current spl mask */
|
||||
str r2, [r1]
|
||||
|
||||
/* stack alignment is 8 bytes */
|
||||
stmfd sp!, {r0, lr} /* Preserve registers */
|
||||
bl _C_LABEL(irq_setmasks) /* Update the actual masks */
|
||||
@ -83,12 +71,6 @@ ENTRY(lowerspl)
|
||||
|
||||
str r3, [r1] /* Store the new spl level */
|
||||
|
||||
ldr r2, .Lspl_masks /* Get the spl mask */
|
||||
ldr r2, [r2, r3, lsl #2]
|
||||
|
||||
ldr r1, .Lspl_mask /* Store in the current spl mask */
|
||||
str r2, [r1]
|
||||
|
||||
/* stack alignment is 8 bytes */
|
||||
stmfd sp!, {r0, lr} /* Preserve registers */
|
||||
bl _C_LABEL(irq_setmasks) /* Update the actual masks */
|
||||
@ -104,15 +86,8 @@ ENTRY(splx)
|
||||
|
||||
str r3, [r1] /* Store the new spl level */
|
||||
|
||||
ldr r2, .Lspl_masks /* Get the spl mask */
|
||||
|
||||
ldr r1, .Lspl_mask /* Store in the current spl mask */
|
||||
|
||||
ldr r2, [r2, r3, lsl #2] /* Use r4 so available later */
|
||||
|
||||
/* stack alignment is 8 bytes */
|
||||
stmfd sp!, {r0, lr} /* Preserve registers */
|
||||
str r2, [r1]
|
||||
|
||||
bl _C_LABEL(irq_setmasks) /* Update the actual masks */
|
||||
bl _C_LABEL(dosoftints) /* Process any pending soft ints */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: iomd_irqhandler.c,v 1.13 2007/02/19 21:46:32 matt Exp $ */
|
||||
/* $NetBSD: iomd_irqhandler.c,v 1.14 2007/08/13 02:04:51 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
@ -40,7 +40,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.13 2007/02/19 21:46:32 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.14 2007/08/13 02:04:51 tsutsui Exp $");
|
||||
|
||||
#include "opt_irqstats.h"
|
||||
|
||||
@ -63,7 +63,6 @@ int current_intr_depth;
|
||||
u_int current_mask;
|
||||
u_int actual_mask;
|
||||
u_int disabled_mask;
|
||||
u_int spl_mask;
|
||||
u_int irqmasks[IPL_LEVELS];
|
||||
|
||||
extern char *_intrnames;
|
||||
@ -118,7 +117,6 @@ irq_init(void)
|
||||
current_mask = 0x00000000;
|
||||
disabled_mask = 0x00000000;
|
||||
actual_mask = 0x00000000;
|
||||
spl_mask = 0x00000000;
|
||||
|
||||
set_spl_masks();
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ofw_irq.S,v 1.7 2007/03/09 19:21:59 thorpej Exp $ */
|
||||
/* $NetBSD: ofw_irq.S,v 1.8 2007/08/13 02:04:51 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
@ -333,9 +333,6 @@ nextirq:
|
||||
PULLFRAMEFROMSVCANDEXIT
|
||||
movs pc, lr /* Exit */
|
||||
|
||||
Lspl_mask:
|
||||
.word _C_LABEL(spl_mask) /* irq's allowed at current spl level */
|
||||
|
||||
Lcurrent_mask:
|
||||
.word _C_LABEL(current_mask) /* irq's that are usable */
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ofw_irqhandler.c,v 1.10 2007/03/08 20:48:39 matt Exp $ */
|
||||
/* $NetBSD: ofw_irqhandler.c,v 1.11 2007/08/13 02:04:51 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
@ -42,7 +42,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.10 2007/03/08 20:48:39 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.11 2007/08/13 02:04:51 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -61,7 +61,6 @@ int current_intr_depth;
|
||||
u_int current_mask;
|
||||
u_int actual_mask;
|
||||
u_int disabled_mask;
|
||||
u_int spl_mask;
|
||||
u_int irqmasks[IPL_LEVELS];
|
||||
extern u_int intrcnt[];
|
||||
|
||||
@ -100,7 +99,6 @@ irq_init()
|
||||
current_mask = 0x00000000;
|
||||
disabled_mask = 0x00000000;
|
||||
actual_mask = 0x00000000;
|
||||
spl_mask = 0x00000000;
|
||||
|
||||
set_spl_masks();
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: sa11x0_irqhandler.c,v 1.10 2006/06/27 13:58:08 peter Exp $ */
|
||||
/* $NetBSD: sa11x0_irqhandler.c,v 1.11 2007/08/13 02:04:51 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
|
||||
@ -76,7 +76,7 @@
|
||||
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.10 2006/06/27 13:58:08 peter Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.11 2007/08/13 02:04:51 tsutsui Exp $");
|
||||
|
||||
#include "opt_irqstats.h"
|
||||
|
||||
@ -101,7 +101,6 @@ u_int actual_mask;
|
||||
#define IPL_LEVELS (NIPL+1)
|
||||
u_int imask[NIPL];
|
||||
#else
|
||||
u_int spl_mask;
|
||||
u_int irqmasks[IPL_LEVELS];
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: isa_irqhandler.c,v 1.14 2007/03/09 18:20:51 matt Exp $ */
|
||||
/* $NetBSD: isa_irqhandler.c,v 1.15 2007/08/13 02:04:51 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997
|
||||
@ -75,7 +75,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: isa_irqhandler.c,v 1.14 2007/03/09 18:20:51 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: isa_irqhandler.c,v 1.15 2007/08/13 02:04:51 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -94,7 +94,6 @@ int current_intr_depth;
|
||||
u_int current_mask;
|
||||
u_int actual_mask;
|
||||
u_int disabled_mask;
|
||||
u_int spl_mask;
|
||||
u_int irqmasks[IPL_LEVELS];
|
||||
|
||||
/* Prototypes */
|
||||
@ -133,7 +132,6 @@ irq_init()
|
||||
current_mask = 0x00000000;
|
||||
disabled_mask = 0x00000000;
|
||||
actual_mask = 0x00000000;
|
||||
spl_mask = 0x00000000;
|
||||
|
||||
set_spl_masks();
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ofw.c,v 1.39 2007/07/30 13:02:01 jmmv Exp $ */
|
||||
/* $NetBSD: ofw.c,v 1.40 2007/08/13 02:04:51 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997
|
||||
@ -41,7 +41,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.39 2007/07/30 13:02:01 jmmv Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.40 2007/08/13 02:04:51 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -102,7 +102,6 @@ extern BootConfig bootconfig; /* temporary, I hope */
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
/* NOTE: These variables will be removed, well some of them */
|
||||
extern u_int spl_mask;
|
||||
extern u_int current_mask;
|
||||
#endif
|
||||
|
||||
@ -338,7 +337,7 @@ ofw_boot(howto, bootstr)
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
printf("boot: howto=%08x curlwp=%p\n", howto, curlwp);
|
||||
printf("current_mask=%08x spl_mask=%08x\n", current_mask, spl_mask);
|
||||
printf("current_mask=%08x\n", current_mask);
|
||||
|
||||
printf("ipl_bio=%08x ipl_net=%08x ipl_tty=%08x ipl_vm=%08x\n",
|
||||
irqmasks[IPL_BIO], irqmasks[IPL_NET], irqmasks[IPL_TTY],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user