diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-04-28 18:09:01 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-04-28 18:09:01 +0000 |
| commit | 015640667fb7604fdaefee8237039ce534be494c (patch) | |
| tree | 3c1b6533428a457d44ab01bb461934ace4630c3e /sys/arch/amd64/include | |
| parent | 60fda8debce0620953c0296903a9dcd12f7837c5 (diff) | |
Rename IPL_SOFTSERIAL to IPL_SOFTTY and rename the associated symbols.
Remove IPL_SERIAL since it is unused.
ok krw@, weingart@, deraadt@
Diffstat (limited to 'sys/arch/amd64/include')
| -rw-r--r-- | sys/arch/amd64/include/intr.h | 9 | ||||
| -rw-r--r-- | sys/arch/amd64/include/intrdefs.h | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h index 17bbb6a115b..317405fe16e 100644 --- a/sys/arch/amd64/include/intr.h +++ b/sys/arch/amd64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.11 2007/05/25 16:22:11 art Exp $ */ +/* $OpenBSD: intr.h,v 1.12 2008/04/28 18:09:00 kettenis Exp $ */ /* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -140,7 +140,6 @@ void softintr(int); #define splaudio() splraise(IPL_AUDIO) #define splclock() splraise(IPL_CLOCK) #define splstatclock() splclock() -#define splserial() splraise(IPL_SERIAL) #define splipi() splraise(IPL_IPI) #define spllpt() spltty() @@ -152,7 +151,7 @@ void softintr(int); */ #define splsoftclock() splraise(IPL_SOFTCLOCK) #define splsoftnet() splraise(IPL_SOFTNET) -#define splsoftserial() splraise(IPL_SOFTSERIAL) +#define splsofttty() splraise(IPL_SOFTTTY) /* * Miscellaneous @@ -198,7 +197,7 @@ void splassert_check(int, const char *); extern void Xsoftclock(void); extern void Xsoftnet(void); -extern void Xsoftserial(void); +extern void Xsofttty(void); extern struct intrstub i8259_stubs[]; extern struct intrstub ioapic_edge_stubs[]; @@ -244,7 +243,7 @@ extern void (*ipifunc[X86_NIPI])(struct cpu_info *); #define X86_SOFTINTR_SOFTCLOCK 0 #define X86_SOFTINTR_SOFTNET 1 -#define X86_SOFTINTR_SOFTSERIAL 2 +#define X86_SOFTINTR_SOFTTTY 2 #define X86_NSOFTINTR 3 #ifndef _LOCORE diff --git a/sys/arch/amd64/include/intrdefs.h b/sys/arch/amd64/include/intrdefs.h index 64a6d3394a9..46f26aeecc4 100644 --- a/sys/arch/amd64/include/intrdefs.h +++ b/sys/arch/amd64/include/intrdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intrdefs.h,v 1.5 2007/05/06 03:37:08 gwk Exp $ */ +/* $OpenBSD: intrdefs.h,v 1.6 2008/04/28 18:09:00 kettenis Exp $ */ /* $NetBSD: intrdefs.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ #ifndef _i386_INTRDEFS_H @@ -15,9 +15,6 @@ * * IPL_HIGH must block everything that can manipulate a run queue. * - * We need serial drivers to run at the absolute highest priority to - * avoid overruns, so serial > high. - * * The level numbers are picked to fit into APIC vector priorities. * */ @@ -26,7 +23,7 @@ #define IPL_SOFTNET 0x5 /* protocol stacks */ #define IPL_BIO 0x6 /* block I/O */ #define IPL_NET 0x7 /* network */ -#define IPL_SOFTSERIAL 0x8 /* serial */ +#define IPL_SOFTTTY 0x8 /* delayed terminal handling */ #define IPL_TTY 0x9 /* terminal */ #define IPL_VM 0xa /* memory allocation */ #define IPL_AUDIO 0xb /* audio */ @@ -34,7 +31,6 @@ #define IPL_SCHED IPL_CLOCK #define IPL_STATCLOCK IPL_CLOCK #define IPL_HIGH 0xd /* everything */ -#define IPL_SERIAL 0xd /* serial */ #define IPL_IPI 0xe /* inter-processor interrupts */ #define NIPL 16 @@ -54,7 +50,7 @@ /* Soft interrupt masks. */ #define SIR_CLOCK 29 #define SIR_NET 28 -#define SIR_SERIAL 27 +#define SIR_TTY 27 /* |