diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2007-02-01 20:39:43 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2007-02-01 20:39:43 +0000 |
| commit | e7eaa73928e8d701dda8576afeb84aedeb49afe2 (patch) | |
| tree | 227827eb4d79e98450f8f09fe7e5cb0bac685736 /sys/arch | |
| parent | fafdfab10d7ca58f82e423702d46609d8d73f37e (diff) | |
Rename the MICROSET IPI we inherited from NetBSD to simply NOP since
it doesn't do anything (other than poking into the kernel a processing
ASTs).
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/ipifuncs.c | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/include/intrdefs.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/ipifuncs.c b/sys/arch/amd64/amd64/ipifuncs.c index 15bb305184d..76ee7273c72 100644 --- a/sys/arch/amd64/amd64/ipifuncs.c +++ b/sys/arch/amd64/amd64/ipifuncs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipifuncs.c,v 1.3 2004/08/04 01:16:36 art Exp $ */ +/* $OpenBSD: ipifuncs.c,v 1.4 2007/02/01 20:39:42 art Exp $ */ /* $NetBSD: ipifuncs.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -80,11 +80,7 @@ void x86_64_reload_mtrr(struct cpu_info *); void (*ipifunc[X86_NIPI])(struct cpu_info *) = { x86_64_ipi_halt, -#if 0 - cc_microset, -#else x86_64_ipi_nop, -#endif x86_64_ipi_flush_fpu, x86_64_ipi_synch_fpu, pmap_do_tlb_shootdown, diff --git a/sys/arch/amd64/include/intrdefs.h b/sys/arch/amd64/include/intrdefs.h index ad4f4a40c19..2f62f2b3b16 100644 --- a/sys/arch/amd64/include/intrdefs.h +++ b/sys/arch/amd64/include/intrdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intrdefs.h,v 1.3 2006/03/12 02:34:39 brad Exp $ */ +/* $OpenBSD: intrdefs.h,v 1.4 2007/02/01 20:39:42 art Exp $ */ /* $NetBSD: intrdefs.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ #ifndef _i386_INTRDEFS_H @@ -74,7 +74,7 @@ #define IDT_INTR_HIGH 0xef #define X86_IPI_HALT 0x00000001 -#define X86_IPI_MICROSET 0x00000002 +#define X86_IPI_NOP 0x00000002 #define X86_IPI_FLUSH_FPU 0x00000004 #define X86_IPI_SYNCH_FPU 0x00000008 #define X86_IPI_TLB 0x00000010 @@ -84,7 +84,7 @@ #define X86_NIPI 8 -#define X86_IPI_NAMES { "halt IPI", "timeset IPI", "FPU flush IPI", \ +#define X86_IPI_NAMES { "halt IPI", "nop IPI", "FPU flush IPI", \ "FPU synch IPI", "TLB shootdown IPI", \ "MTRR update IPI", "GDT update IPI", "ddb IPI" } |