--- highmem.h.prev	Sun Sep  9 08:59:04 2001
+++ highmem.h	Sun Sep  9 09:00:07 2001
@@ -88,6 +88,7 @@
 	if (page < highmem_start_page)
 		return page_address(page);
 
+	ctx_sw_off();
 	idx = type + KM_TYPE_NR*smp_processor_id();
 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
 #if HIGHMEM_DEBUG
@@ -119,6 +120,7 @@
 	pte_clear(kmap_pte-idx);
 	__flush_tlb_one(vaddr);
 #endif
+	ctx_sw_on();
 }
 
 #endif /* __KERNEL__ */