diff options
| author | Ian Moffett <ian@osmora.org> | 2024-03-17 20:59:31 -0400 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2024-03-17 20:59:31 -0400 |
| commit | 0776264c266e7c1619b8b8b84d2da5384979bb3c (patch) | |
| tree | 80b6ded012336e24c72cc2c16e4c3ce952b7b739 /sys/include/arch/amd64/trap.h | |
| parent | 7895aaff402a021a1b04645ca8d251f760e5662e (diff) | |
| parent | 2896f4126de2ee0fd1bab4b960bfb2213c359f18 (diff) | |
Merge branch 'user' into dev
Diffstat (limited to 'sys/include/arch/amd64/trap.h')
| -rw-r--r-- | sys/include/arch/amd64/trap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/include/arch/amd64/trap.h b/sys/include/arch/amd64/trap.h index 1019999..c75fa28 100644 --- a/sys/include/arch/amd64/trap.h +++ b/sys/include/arch/amd64/trap.h @@ -47,6 +47,7 @@ #define TRAP_PROTFLT 9 /* General protection */ #define TRAP_PAGEFLT 10 /* Page fault */ #define TRAP_NMI 11 /* Non-maskable interrupt */ +#define TRAP_SS 12 /* Stack-segment fault */ /* Trap is coming from user mode */ #define TRAP_USER 0x100 @@ -65,6 +66,7 @@ void segnp(void *sf); void general_prot(void *sf); void page_fault(void *sf); void nmi(void *sf); +void ss_fault(void *sf); void trap_handler(struct trapframe *tf); #else .macro handle_trap |