summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-03-08 11:56:18 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-03-08 11:56:18 +0100
commitf9ab17f900ccce345539a0d7a0c09363d414c7dc (patch)
treec748371dae8919a9e1e660b21e18cef4b972ad8d
parent713e142a5e98e394454c202abffb645181e11964 (diff)
Remove spl debugging in Xen case
xen cli/sti doesn't use IF * i386/i386/spl.S [MACH_XEN]: Disable IF check.
-rw-r--r--i386/i386/spl.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/i386/i386/spl.S b/i386/i386/spl.S
index 41458ac..1dce991 100644
--- a/i386/i386/spl.S
+++ b/i386/i386/spl.S
@@ -149,7 +149,7 @@ ENTRY(spl7)
ENTRY(splx)
movl S_ARG0,%edx /* get ipl */
-#if MACH_KDB || MACH_TTD
+#if (MACH_KDB || MACH_TTD) && !defined(MACH_XEN)
/* First make sure that if we're exitting from ipl7, IF is still cleared */
cmpl $SPL7,EXT(curr_ipl) /* from ipl7? */
jne 0f
@@ -160,7 +160,7 @@ ENTRY(splx)
int3 /* Oops, interrupts got enabled?! */
0:
-#endif /* MACH_KDB || MACH_TTD */
+#endif /* (MACH_KDB || MACH_TTD) && !MACH_XEN */
testl %edx,%edx /* spl0? */
jz EXT(spl0) /* yes, handle specially */
cmpl EXT(curr_ipl),%edx /* same ipl as current? */
@@ -227,7 +227,7 @@ splx_cli:
.align TEXT_ALIGN
.globl spl
spl:
-#if MACH_KDB || MACH_TTD
+#if (MACH_KDB || MACH_TTD) && !defined(MACH_XEN)
/* First make sure that if we're exitting from ipl7, IF is still cleared */
cmpl $SPL7,EXT(curr_ipl) /* from ipl7? */
jne 0f
@@ -238,7 +238,7 @@ spl:
int3 /* Oops, interrupts got enabled?! */
0:
-#endif /* MACH_KDB || MACH_TTD */
+#endif /* (MACH_KDB || MACH_TTD) && !MACH_XEN */
cmpl $SPL7,%edx /* spl7? */
je EXT(spl7) /* yes, handle specially */
movl EXT(pic_mask)(,%edx,4),%eax