summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2019-03-25 18:45:28 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2019-03-25 18:45:28 +0000
commitbd0a1a6eeaab32af58ae54b8dd1e1fe12b8a0163 (patch)
treee336e6c6ca4b5708c0c9089614b2dc407664f89a
parent102daccd3a61b9874a467b35257b5587623d8778 (diff)
X86_IPI_NAMES's only use was #if 0'ed out; delete both
ok kettenis@ deraadt@
-rw-r--r--sys/arch/amd64/amd64/intr.c6
-rw-r--r--sys/arch/amd64/include/intrdefs.h7
2 files changed, 2 insertions, 11 deletions
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c
index 34e132465f0..ef575c628a2 100644
--- a/sys/arch/amd64/amd64/intr.c
+++ b/sys/arch/amd64/amd64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.51 2018/01/22 09:08:43 mpi Exp $ */
+/* $OpenBSD: intr.c,v 1.52 2019/03/25 18:45:27 guenther Exp $ */
/* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */
/*
@@ -553,10 +553,6 @@ struct intrhand fake_xen_intrhand;
struct intrhand fake_hyperv_intrhand;
#endif
-#if NLAPIC > 0 && defined(MULTIPROCESSOR) && 0
-static char *x86_ipi_names[X86_NIPI] = X86_IPI_NAMES;
-#endif
-
/*
* Initialize all handlers that aren't dynamically allocated, and exist
* for each CPU.
diff --git a/sys/arch/amd64/include/intrdefs.h b/sys/arch/amd64/include/intrdefs.h
index ca1ec3bf84e..cecb7061123 100644
--- a/sys/arch/amd64/include/intrdefs.h
+++ b/sys/arch/amd64/include/intrdefs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intrdefs.h,v 1.18 2018/06/05 06:39:11 guenther Exp $ */
+/* $OpenBSD: intrdefs.h,v 1.19 2019/03/25 18:45:27 guenther Exp $ */
/* $NetBSD: intrdefs.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */
#ifndef _AMD64_INTRDEFS_H
@@ -85,11 +85,6 @@
#define X86_NIPI 10
-#define X86_IPI_NAMES { "halt IPI", "nop IPI", NULL, \
- NULL, "TLB shootdown IPI", \
- "MTRR update IPI", "setperf IPI", "ddb IPI", \
- "VMM start IPI", "VMM stop IPI" }
-
#define IREENT_MAGIC 0x18041969
#endif /* _AMD64_INTRDEFS_H */