diff options
| author | Roland McGrath <roland@gnu.org> | 2002-04-23 20:47:39 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-17 23:31:41 +0200 |
| commit | 97ef312e4df2e096a94134c93ffc5b9a808f8115 (patch) | |
| tree | f9b26155b7e4fff40be30f88d43b6324d7ca7ebd | |
| parent | b9df0050cc90310ecece76d78f3a5102eb48aa7b (diff) | |
(user_trap): revert last change
| -rw-r--r-- | i386/i386/trap.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/i386/i386/trap.c b/i386/i386/trap.c index c18adb05..653d66e7 100644 --- a/i386/i386/trap.c +++ b/i386/i386/trap.c @@ -51,14 +51,6 @@ #include <i386/io_emulate.h> -#if MULTIPROCESSOR -# include <i386/mp_desc.h> -# define user_thread_register \ - (mp_desc_table[cpu_number()]->user_thread_register) -#else -extern natural_t user_thread_register; -#endif - #include <oskit/gdb.h> #include <oskit/x86/pc/base_console.h> /* enable_gdb */ #include <oskit/x86/physmem.h> @@ -476,11 +468,7 @@ int user_trap(regs) printf("user page fault at linear address %08x\n", subcode); trap_dump (regs); #endif - if (subcode >= LINEAR_MIN_KERNEL_ADDRESS) - /* This must be an access through the USER_GS segment. */ - assert (trunc_page(subcode) == - kvtolin(trunc_page(&user_thread_register))); - + assert(subcode < LINEAR_MIN_KERNEL_ADDRESS); (void) vm_fault(thread->task->map, trunc_page((vm_offset_t)subcode), (regs->err & T_PF_WRITE) |