diff options
Diffstat (limited to 'arch/x86/machine')
-rw-r--r-- | arch/x86/machine/cpu.c | 11 | ||||
-rw-r--r-- | arch/x86/machine/cpu.h | 14 | ||||
-rw-r--r-- | arch/x86/machine/trap.c | 3 | ||||
-rw-r--r-- | arch/x86/machine/trap.h | 1 | ||||
-rw-r--r-- | arch/x86/machine/trap_asm.S | 1 |
5 files changed, 0 insertions, 30 deletions
diff --git a/arch/x86/machine/cpu.c b/arch/x86/machine/cpu.c index 8d680d8..18686a3 100644 --- a/arch/x86/machine/cpu.c +++ b/arch/x86/machine/cpu.c @@ -17,7 +17,6 @@ #include <kern/assert.h> #include <kern/init.h> -#include <kern/llsync.h> #include <kern/macros.h> #include <kern/panic.h> #include <kern/param.h> @@ -608,13 +607,3 @@ cpu_thread_schedule_intr(struct trap_frame *frame) thread_schedule_intr(); } - -void -cpu_llsync_reset_intr(struct trap_frame *frame) -{ - (void)frame; - - lapic_eoi(); - - llsync_reset_checkpoint(cpu_id()); -} diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h index f1e9cfb..07dd98d 100644 --- a/arch/x86/machine/cpu.h +++ b/arch/x86/machine/cpu.h @@ -658,20 +658,6 @@ cpu_send_thread_schedule(unsigned int cpu) */ void cpu_thread_schedule_intr(struct trap_frame *frame); -/* - * Request a remote processor to reset its checkpoint. - */ -static inline void -cpu_send_llsync_reset(unsigned int cpu) -{ - lapic_ipi_send(cpu_from_id(cpu)->apic_id, TRAP_LLSYNC_RESET); -} - -/* - * Interrupt handler for checkpoint reset requests. - */ -void cpu_llsync_reset_intr(struct trap_frame *frame); - #endif /* __ASSEMBLER__ */ #endif /* _X86_CPU_H */ diff --git a/arch/x86/machine/trap.c b/arch/x86/machine/trap.c index ad586ea..8e350f0 100644 --- a/arch/x86/machine/trap.c +++ b/arch/x86/machine/trap.c @@ -75,7 +75,6 @@ void trap_isr_machine_check(void); void trap_isr_simd_fp_exception(void); void trap_isr_pic_int7(void); void trap_isr_pic_int15(void); -void trap_isr_llsync_reset(void); void trap_isr_thread_schedule(void); void trap_isr_cpu_halt(void); void trap_isr_lapic_timer(void); @@ -202,8 +201,6 @@ trap_setup(void) trap_isr_pic_int15, pic_intr_spurious); /* System defined traps */ - trap_install(TRAP_LLSYNC_RESET, TRAP_HF_NOPREEMPT, - trap_isr_llsync_reset, cpu_llsync_reset_intr); trap_install(TRAP_THREAD_SCHEDULE, TRAP_HF_NOPREEMPT, trap_isr_thread_schedule, cpu_thread_schedule_intr); trap_install(TRAP_CPU_HALT, TRAP_HF_NOPREEMPT, diff --git a/arch/x86/machine/trap.h b/arch/x86/machine/trap.h index bc0426d..99e2389 100644 --- a/arch/x86/machine/trap.h +++ b/arch/x86/machine/trap.h @@ -53,7 +53,6 @@ * * The local APIC assigns one priority every 16 vectors. */ -#define TRAP_LLSYNC_RESET 238 #define TRAP_THREAD_SCHEDULE 239 #define TRAP_CPU_HALT 240 #define TRAP_LAPIC_TIMER 253 diff --git a/arch/x86/machine/trap_asm.S b/arch/x86/machine/trap_asm.S index 7d06d9d..bb70f46 100644 --- a/arch/x86/machine/trap_asm.S +++ b/arch/x86/machine/trap_asm.S @@ -157,7 +157,6 @@ TRAP(TRAP_PIC_BASE + 7, trap_isr_pic_int7) TRAP(TRAP_PIC_BASE + 15, trap_isr_pic_int15) /* System defined traps */ -TRAP(TRAP_LLSYNC_RESET, trap_isr_llsync_reset) TRAP(TRAP_THREAD_SCHEDULE, trap_isr_thread_schedule) TRAP(TRAP_CPU_HALT, trap_isr_cpu_halt) TRAP(TRAP_LAPIC_TIMER, trap_isr_lapic_timer) |