xnu-344.tar.gz

[apple/xnu.git] / osfmk / i386 / trap.c

diff --git a/osfmk/i386/trap.c b/osfmk/i386/trap.c
index cd7925ee7bac135f5e366cc3db6be3d040d8ed47..5a6b78c200e366f9d38d249d8354b6546af86da2 100644 (file)
--- a/osfmk/i386/trap.c
+++ b/osfmk/i386/trap.c
@@ -173,7 +173,7 @@ user_page_fault_continue(
        register thread_t       cur_thr = current_thread();
        register struct i386_saved_state *regs = USER_REGS(thr_act);
 
-       if ((kr == KERN_SUCCESS) && (kr == KERN_ABORTED)) {
+       if ((kr == KERN_SUCCESS) || (kr == KERN_ABORTED)) {
 #if    MACH_KDB
                if (!db_breakpoints_inserted) {
                        db_set_breakpoints();
@@ -355,7 +355,7 @@ kernel_trap(
                                          trunc_page((vm_offset_t)subcode),
                                          VM_PROT_READ|VM_PROT_WRITE,
                                          FALSE, 
-                                         (map == kernel_map) ? interruptible : THREAD_ABORTSAFE);
+                                         (map == kernel_map) ? interruptible : THREAD_ABORTSAFE, NULL, 0);
                }
 #if    MACH_KDB
                if (result == KERN_SUCCESS) {
@@ -577,7 +577,7 @@ user_trap(
                                trunc_page((vm_offset_t)subcode),
                                prot,
                                FALSE,
-                               THREAD_ABORTSAFE));
+                               THREAD_ABORTSAFE, NULL, 0));
                        /* NOTREACHED */
                }
                else {
@@ -589,7 +589,7 @@ user_trap(
                                trunc_page((vm_offset_t)subcode),
                                prot,
                                FALSE,
-                               (map == kernel_map) ? THREAD_UNINT : THREAD_ABORTSAFE);
+                               (map == kernel_map) ? THREAD_UNINT : THREAD_ABORTSAFE, NULL, 0);
                        if ((result != KERN_SUCCESS) && (result != KERN_ABORTED)) {
                                /*
                                 * Must expand vm_fault by hand,
@@ -1123,7 +1123,7 @@ i386_astintr(int preemption)
        mp_enable_preemption();
 #endif
 
-           ast_taken(preemption, mask, s
+           ast_taken(mask, s
 #if    FAST_IDLE
                      ,NO_IDLE_THREAD
 #endif /* FAST_IDLE */