diff options
| -rw-r--r-- | sys/amd64/amd64/trap.c | 2 | ||||
| -rw-r--r-- | sys/amd64/include/trap.h | 1 | ||||
| -rw-r--r-- | sys/i386/i386/trap.c | 2 | ||||
| -rw-r--r-- | sys/i386/include/trap.h | 1 | ||||
| -rw-r--r-- | sys/i386/isa/ipl.s | 1 | ||||
| -rw-r--r-- | sys/kern/subr_trap.c | 2 |
6 files changed, 3 insertions, 6 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index f778666aa071..da4f1dbd0f6e 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -123,7 +123,7 @@ static char *trap_msg[] = { "", /* 4 unused */ "", /* 5 unused */ "arithmetic trap", /* 6 T_ARITHTRAP */ - "system forced exception", /* 7 T_ASTFLT */ + "", /* 7 unused */ "", /* 8 unused */ "general protection fault", /* 9 T_PROTFLT */ "trace trap", /* 10 T_TRCTRAP */ diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h index 49066419b6d6..6db97ecc18d5 100644 --- a/sys/amd64/include/trap.h +++ b/sys/amd64/include/trap.h @@ -48,7 +48,6 @@ #define T_PRIVINFLT 1 /* privileged instruction */ #define T_BPTFLT 3 /* breakpoint instruction */ #define T_ARITHTRAP 6 /* arithmetic trap */ -#define T_ASTFLT 7 /* system forced exception */ #define T_PROTFLT 9 /* protection fault */ #define T_TRCTRAP 10 /* debug exception (sic) */ #define T_PAGEFLT 12 /* page fault */ diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index f778666aa071..da4f1dbd0f6e 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -123,7 +123,7 @@ static char *trap_msg[] = { "", /* 4 unused */ "", /* 5 unused */ "arithmetic trap", /* 6 T_ARITHTRAP */ - "system forced exception", /* 7 T_ASTFLT */ + "", /* 7 unused */ "", /* 8 unused */ "general protection fault", /* 9 T_PROTFLT */ "trace trap", /* 10 T_TRCTRAP */ diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h index 49066419b6d6..6db97ecc18d5 100644 --- a/sys/i386/include/trap.h +++ b/sys/i386/include/trap.h @@ -48,7 +48,6 @@ #define T_PRIVINFLT 1 /* privileged instruction */ #define T_BPTFLT 3 /* breakpoint instruction */ #define T_ARITHTRAP 6 /* arithmetic trap */ -#define T_ASTFLT 7 /* system forced exception */ #define T_PROTFLT 9 /* protection fault */ #define T_TRCTRAP 10 /* debug exception (sic) */ #define T_PAGEFLT 12 /* page fault */ diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s index 25af1f7062df..22cc484f79c4 100644 --- a/sys/i386/isa/ipl.s +++ b/sys/i386/isa/ipl.s @@ -67,7 +67,6 @@ doreti_next: je doreti_exit /* no, defer */ doreti_ast: - movl $T_ASTFLT,TF_TRAPNO(%esp) call _ast /* diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index f778666aa071..da4f1dbd0f6e 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -123,7 +123,7 @@ static char *trap_msg[] = { "", /* 4 unused */ "", /* 5 unused */ "arithmetic trap", /* 6 T_ARITHTRAP */ - "system forced exception", /* 7 T_ASTFLT */ + "", /* 7 unused */ "", /* 8 unused */ "general protection fault", /* 9 T_PROTFLT */ "trace trap", /* 10 T_TRCTRAP */ |