summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2003-04-05 22:18:14 +0000
committerpeter <peter@FreeBSD.org>2003-04-05 22:18:14 +0000
commit620ab7fc9b41d5ea1c19897edc93a00eff61b97c (patch)
tree2689b51864c22684ed58563dabf1923586307ce0
parent38500c73db6da66a1057fcc993526ef523bba212 (diff)
downloadFreeBSD-src-620ab7fc9b41d5ea1c19897edc93a00eff61b97c.zip
FreeBSD-src-620ab7fc9b41d5ea1c19897edc93a00eff61b97c.tar.gz
Unbreak the !LAZY_SWITCH case. I #ifdef'ed too much when I added
the ifdefs prior to commit and killed the same-address-space test. Submitted by: bde
-rw-r--r--sys/amd64/amd64/cpu_switch.S3
-rw-r--r--sys/amd64/amd64/swtch.s3
-rw-r--r--sys/i386/i386/swtch.s3
3 files changed, 3 insertions, 6 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 793e634..a19baa7 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -174,6 +174,7 @@ ENTRY(cpu_switch)
je sw1
#endif
1:
+#endif
movl %cr3,%ebx /* The same address space? */
cmpl %ebx,%eax
#ifdef SWTCH_OPTIM_STATS
@@ -181,8 +182,6 @@ ENTRY(cpu_switch)
#else
je sw1
#endif
-#endif
-
#ifdef SWTCH_OPTIM_STATS
incl tlb_flush_count
#endif
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 793e634..a19baa7 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -174,6 +174,7 @@ ENTRY(cpu_switch)
je sw1
#endif
1:
+#endif
movl %cr3,%ebx /* The same address space? */
cmpl %ebx,%eax
#ifdef SWTCH_OPTIM_STATS
@@ -181,8 +182,6 @@ ENTRY(cpu_switch)
#else
je sw1
#endif
-#endif
-
#ifdef SWTCH_OPTIM_STATS
incl tlb_flush_count
#endif
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 793e634..a19baa7 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -174,6 +174,7 @@ ENTRY(cpu_switch)
je sw1
#endif
1:
+#endif
movl %cr3,%ebx /* The same address space? */
cmpl %ebx,%eax
#ifdef SWTCH_OPTIM_STATS
@@ -181,8 +182,6 @@ ENTRY(cpu_switch)
#else
je sw1
#endif
-#endif
-
#ifdef SWTCH_OPTIM_STATS
incl tlb_flush_count
#endif
OpenPOWER on IntegriCloud