summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/trap.c6
-rw-r--r--sys/i386/i386/trap.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index f8662b2..a0f8508 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -470,9 +470,6 @@ trap(frame)
if (PCPU_GET(curpcb)->pcb_flags & PCB_VM86CALL)
break;
- if (td->td_intr_nesting_level != 0)
- break;
-
/*
* Invalid %fs's and %gs's can be created using
* procfs or PT_SETREGS or by invalidating the
@@ -495,6 +492,9 @@ trap(frame)
goto out;
}
+ if (td->td_intr_nesting_level != 0)
+ break;
+
/*
* Invalid segment selectors and out of bounds
* %eip's and %esp's can be set up in user mode.
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index f8662b2..a0f8508 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -470,9 +470,6 @@ trap(frame)
if (PCPU_GET(curpcb)->pcb_flags & PCB_VM86CALL)
break;
- if (td->td_intr_nesting_level != 0)
- break;
-
/*
* Invalid %fs's and %gs's can be created using
* procfs or PT_SETREGS or by invalidating the
@@ -495,6 +492,9 @@ trap(frame)
goto out;
}
+ if (td->td_intr_nesting_level != 0)
+ break;
+
/*
* Invalid segment selectors and out of bounds
* %eip's and %esp's can be set up in user mode.
OpenPOWER on IntegriCloud