summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/x86/machine/trap.h7
-rw-r--r--arch/x86/machine/trap_asm.S12
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/machine/trap.h b/arch/x86/machine/trap.h
index 845ac077..cc805deb 100644
--- a/arch/x86/machine/trap.h
+++ b/arch/x86/machine/trap.h
@@ -148,13 +148,6 @@ void trap_frame_show(struct trap_frame *frame);
*/
void trap_stack_show(struct trap_frame *frame);
-/*
- * Load a context saved in a trap frame.
- *
- * The caller context is lost.
- */
-void __noreturn trap_load(struct trap_frame *frame);
-
#endif /* __ASSEMBLER__ */
#endif /* _X86_TRAP_H */
diff --git a/arch/x86/machine/trap_asm.S b/arch/x86/machine/trap_asm.S
index 5831a0db..cf51b389 100644
--- a/arch/x86/machine/trap_asm.S
+++ b/arch/x86/machine/trap_asm.S
@@ -80,12 +80,6 @@ ASM_ENTRY(trap_common)
iretq
ASM_END(trap_common)
-ASM_ENTRY(trap_load)
- movq %rdi, %rsp
- TRAP_LOAD_REGISTERS
- iretq
-ASM_END(trap_load)
-
#else /* __LP64__ */
.macro TRAP_STORE_REGISTERS
@@ -136,12 +130,6 @@ ASM_ENTRY(trap_common)
iret
ASM_END(trap_common)
-ASM_ENTRY(trap_load)
- movl 4(%esp), %esp
- TRAP_LOAD_REGISTERS
- iret
-ASM_END(trap_load)
-
#endif /* __LP64__ */
/* Architecture defined traps */