Module Name: src
Committed By: snj
Date: Tue Dec 1 19:40:10 UTC 2009
Modified Files:
src/sys/arch/amiga/amiga [netbsd-5]: machdep.c
Log Message:
Pull up following revision(s) (requested by mhitch in ticket #1166):
sys/arch/amiga/amiga/machdep.c: revision 1.222
Remove old legacy IPL_* settings in ipl2spl_table - they are redundant
and in the case of IPL_AUDIO, results in IPL_VM blocking all interrupts.
[IPL_AUDIO is now the same as IPL_VM, and was setting the IPL_VM entry
to PSL_IPL6. IPL_SERIAL had a duplicate entry for some reason, and
serial drivers that check and modify IPL_SERIAL now shouldn't be affected
since IPL_SERIAL is now the same as IPL_HIGH. I'm hoping this will fix
or at least help the problem of serial interrupts being blocked too long.
To generate a diff of this commit:
cvs rdiff -u -r1.209.6.1 -r1.209.6.2 src/sys/arch/amiga/amiga/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/amiga/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.209.6.1 src/sys/arch/amiga/amiga/machdep.c:1.209.6.2
--- src/sys/arch/amiga/amiga/machdep.c:1.209.6.1 Mon Feb 2 03:30:32 2009
+++ src/sys/arch/amiga/amiga/machdep.c Tue Dec 1 19:40:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.209.6.1 2009/02/02 03:30:32 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.209.6.2 2009/12/01 19:40:09 snj Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -85,7 +85,7 @@
#include "opt_panicbutton.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.209.6.1 2009/02/02 03:30:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.209.6.2 2009/12/01 19:40:09 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1497,19 +1497,12 @@
int ipl2spl_table[_NIPL] = {
[IPL_NONE] = PSL_IPL0|PSL_S,
[IPL_SOFTCLOCK] = PSL_IPL1|PSL_S,
- [IPL_BIO] = PSL_IPL3|PSL_S,
- [IPL_NET] = PSL_IPL3|PSL_S,
- [IPL_TTY] = PSL_IPL4|PSL_S,
- [IPL_SERIAL] = PSL_IPL5|PSL_S,
[IPL_VM] = PSL_IPL4|PSL_S,
- [IPL_SERIAL] = PSL_IPL4|PSL_S, /* patched by some devices at attach
- time (currently, only the coms) */
- [IPL_AUDIO] = PSL_IPL6|PSL_S,
#if defined(LEV6_DEFER)
- [IPL_CLOCK] = PSL_IPL4|PSL_S,
+ [IPL_SCHED] = PSL_IPL4|PSL_S,
[IPL_HIGH] = PSL_IPL4|PSL_S,
#else /* defined(LEV6_DEFER) */
- [IPL_CLOCK] = PSL_IPL6|PSL_S,
+ [IPL_SCHED] = PSL_IPL6|PSL_S,
[IPL_HIGH] = PSL_IPL7|PSL_S,
#endif /* defined(LEV6_DEFER) */
};
