From 6937ca29dca3206c25908a732b154c7d10dab0b8 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 13 Aug 2001 22:41:15 +0000 Subject: [PATCH] Remove IPI_HALT to make way for a more correct fix for halts and restarts on SMP alphas. --- sys/alpha/alpha/machdep.c | 8 -------- sys/alpha/alpha/mp_machdep.c | 3 --- sys/alpha/alpha/vm_machdep.c | 11 ----------- sys/alpha/include/smp.h | 1 - 4 files changed, 23 deletions(-) diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 490ea29c838..8123ec29ed2 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -1619,14 +1619,6 @@ cpu_boot(int howto) void cpu_halt(void) { -#ifdef SMP - printf("sending IPI_HALT to other processors\n"); - DELAY(1000000); - ipi_all_but_self(IPI_HALT); - DELAY(1000000); - printf("Halting Self\n"); - DELAY(1000000); -#endif prom_halt(1); } diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c index eba0725280d..205dd970e94 100644 --- a/sys/alpha/alpha/mp_machdep.c +++ b/sys/alpha/alpha/mp_machdep.c @@ -476,9 +476,6 @@ smp_handle_ipi(struct trapframe *frame) atomic_clear_int(&started_cpus, cpumask); atomic_clear_int(&stopped_cpus, cpumask); break; - case IPI_HALT: - prom_halt(1); - /* NOTREACHED */ } } diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c index 87b03358fd9..195a9349f1a 100644 --- a/sys/alpha/alpha/vm_machdep.c +++ b/sys/alpha/alpha/vm_machdep.c @@ -95,9 +95,6 @@ #include #include -#ifdef SMP -#include -#endif /* * quick version of vm_fault @@ -391,14 +388,6 @@ vunmapbuf(bp) void cpu_reset() { -#ifdef SMP - printf("sending IPI_HALT to other processors\n"); - DELAY(1000000); - ipi_all_but_self(IPI_HALT); - DELAY(1000000); - printf("Rebooting Self\n"); - DELAY(1000000); -#endif prom_halt(0); } diff --git a/sys/alpha/include/smp.h b/sys/alpha/include/smp.h index 981647b8199..05af7f47e1b 100644 --- a/sys/alpha/include/smp.h +++ b/sys/alpha/include/smp.h @@ -23,7 +23,6 @@ #define IPI_AST 0x0004 #define IPI_CHECKSTATE 0x0008 #define IPI_STOP 0x0010 -#define IPI_HALT 0x1000 #ifndef LOCORE