diff options
| author |   mikeb <mikeb@openbsd.org> | 2015-07-13 17:45:01 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2015-07-13 17:45:01 +0000 |
| commit | e909224bf37f55693bbc85724e62b52a110a96c8 (patch) | |
| tree | 251eeea737540bdf30379ecb06def9146b95d0a7 | |
| parent | Fix line endings. (diff) | |
| download | wireguard-openbsd-e909224bf37f55693bbc85724e62b52a110a96c8.tar.xz wireguard-openbsd-e909224bf37f55693bbc85724e62b52a110a96c8.zip | |
remove unused isa_nodefaultirq; ok kettenis, mlarkin
| -rw-r--r-- | sys/arch/i386/i386/ioapic.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 3 | ||||
| -rw-r--r-- | sys/arch/i386/isa/isa_machdep.c | 12 |
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/arch/i386/i386/ioapic.c b/sys/arch/i386/i386/ioapic.c index e05befacaa3..2d7226e5d4a 100644 --- a/sys/arch/i386/i386/ioapic.c +++ b/sys/arch/i386/i386/ioapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioapic.c,v 1.35 2015/04/29 04:29:23 jsg Exp $ */ +/* $OpenBSD: ioapic.c,v 1.36 2015/07/13 17:45:01 mikeb Exp $ */ /* $NetBSD: ioapic.c,v 1.7 2003/07/14 22:32:40 lukem Exp $ */ /*- @@ -585,10 +585,6 @@ ioapic_enable(void) outb(IMCR_DATA, IMCR_APIC); } -#if 0 /* XXX Will be removed when we have intrsource. */ - isa_nodefaultirq(); -#endif - for (sc = ioapics; sc != NULL; sc = sc->sc_next) { if (mp_verbose) printf("%s: enabling\n", sc->sc_pic.pic_name); diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 99ea6e54ee8..3da258a9567 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.143 2015/07/02 01:33:59 dlg Exp $ */ +/* $OpenBSD: cpu.h,v 1.144 2015/07/13 17:45:01 mikeb Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -449,7 +449,6 @@ int i386_set_ldt(struct proc *, void *, register_t *); /* isa_machdep.c */ void isa_defaultirq(void); -void isa_nodefaultirq(void); int isa_nmi(void); /* pmap.c */ diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c index f7daed5d7d5..f511b756cf5 100644 --- a/sys/arch/i386/isa/isa_machdep.c +++ b/sys/arch/i386/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.79 2015/01/24 15:13:55 kettenis Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.80 2015/07/13 17:45:01 mikeb Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ /*- @@ -199,16 +199,6 @@ isa_defaultirq(void) outb(IO_ICU2, 0x0a); /* Read IRR by default. */ } -void -isa_nodefaultirq(void) -{ - int i; - - /* icu vectors */ - for (i = 0; i < ICU_LEN; i++) - unsetgate(&idt[ICU_OFFSET + i]); -} - /* * Handle a NMI, possibly a machine check. * return true to panic system, false to ignore. |