From c81e825f6c81f94bcb923db06b8b2f5be0038fef Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 5 Apr 2003 22:18:14 +0000 Subject: 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 --- sys/amd64/amd64/cpu_switch.S | 3 +-- sys/amd64/amd64/swtch.s | 3 +-- sys/i386/i386/swtch.s | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 793e63431f4a..a19baa705749 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 793e63431f4a..a19baa705749 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 793e63431f4a..a19baa705749 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 -- cgit v1.3