Backout the 2.6.21 lazy mode fix
PATCH 2/3 Backout the 2.6.21 lazy mode fix
Revert the last patch; it is only for 2.6.21, and an updated version will be merged for 2.6.22. Do this before applying other i386 paravirt-ops patches to avoid merge conflicts caused by code movement and cleanup.
Signed-off-by Zachary Amsden <[email protected]>
arch/i386/kernel/vmi.c +1 -22
@@ -69,7 +69,6 @@ struct {void (*flush_tlb)(int );void (*set_initial_ap_state)(int ,int );void (*halt)(void ); -void (*set_lazy_mode)(int mode); } vmi_ops;/* XXX move this to alternative.h */
@@ -575,26 +574,6 @@ vmi_startup_ipi_hook(int phys_apicid, un }#endif -static void vmi_set_lazy_mode (int mode) -{ - static DEFINE_PER_CPU(int, lazy_mode); - -if (!vmi_ops.set_lazy_mode) -return ; - -/* Modes should never nest or overlap */ -BUG_ON (__get_cpu_var (lazy_mode) && !(mode ==PARAVIRT_LAZY_NONE || - mode ==PARAVIRT_LAZY_FLUSH )); - -if (mode ==PARAVIRT_LAZY_FLUSH ) { - vmi_ops.set_lazy_mode (0 ); - vmi_ops.set_lazy_mode (__get_cpu_var (lazy_mode)); - }else { - vmi_ops.set_lazy_mode (mode); -__get_cpu_var (lazy_mode) = mode; - } -} -static inline int __init check_vmi_rom (struct vrom_header *rom) {struct pci_header *pci;
@@ -825,7 +804,7 @@ static inline int __init activate_vmi(vopara_wrap (load_esp0, vmi_load_esp0, set_kernel_stack, UpdateKernelStack);para_fill (set_iopl_mask, SetIOPLMask);para_fill (io_delay, IODelay); -para_wrap (set_lazy_mode, vmi_set_lazy_mode, set_lazy_mode, SetLazyMode); +para_fill (set_lazy_mode, SetLazyMode);/* user and kernel flush are just handled with different flags to FlushTLB */ para_wrap (flush_tlb_user, vmi_flush_tlb_user, flush_tlb, FlushTLB);
arch/i386/mm/highmem.c +0 -2
@@ -42,7 +42,6 @@ void *kmap_atomic(struct page *page, enu vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);set_pte (kmap_pte-idx,mk_pte (page, kmap_prot)); -arch_flush_lazy_mmu_mode ();return (void *) vaddr; }
@@ -83,7 +82,6 @@ void *kmap_atomic_pfn(unsigned long pfn, idx = type +KM_TYPE_NR *smp_processor_id (); vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);set_pte (kmap_pte-idx,pfn_pte (pfn, kmap_prot)); -arch_flush_lazy_mmu_mode ();return (void *) vaddr; }
include/asm-generic/pgtable.h +0 -2
@@ -180,7 +180,6 @@ static inline void ptep_set_wrprotect(st#ifndef __HAVE_ARCH_ENTER_LAZY_MMU_MODE#define arch_enter_lazy_mmu_mode () do {} while (0)#define arch_leave_lazy_mmu_mode () do {} while (0) -#define arch_flush_lazy_mmu_mode () do {} while (0)#endif /*
@@ -194,7 +193,6 @@ static inline void ptep_set_wrprotect(st#ifndef __HAVE_ARCH_ENTER_LAZY_CPU_MODE#define arch_enter_lazy_cpu_mode () do {} while (0)#define arch_leave_lazy_cpu_mode () do {} while (0) -#define arch_flush_lazy_cpu_mode () do {} while (0)#endif /*
include/asm-i386/paravirt.h +0 -3
@@ -421,17 +421,14 @@ static inline void pmd_clear(pmd_t *pmdp#define PARAVIRT_LAZY_NONE 0#define PARAVIRT_LAZY_MMU 1#define PARAVIRT_LAZY_CPU 2 -#define PARAVIRT_LAZY_FLUSH 3#define __HAVE_ARCH_ENTER_LAZY_CPU_MODE#define arch_enter_lazy_cpu_mode () paravirt_ops.set_lazy_mode(PARAVIRT_LAZY_CPU)#define arch_leave_lazy_cpu_mode () paravirt_ops.set_lazy_mode(PARAVIRT_LAZY_NONE) -#define arch_flush_lazy_cpu_mode () paravirt_ops.set_lazy_mode(PARAVIRT_LAZY_FLUSH)#define __HAVE_ARCH_ENTER_LAZY_MMU_MODE#define arch_enter_lazy_mmu_mode () paravirt_ops.set_lazy_mode(PARAVIRT_LAZY_MMU)#define arch_leave_lazy_mmu_mode () paravirt_ops.set_lazy_mode(PARAVIRT_LAZY_NONE) -#define arch_flush_lazy_mmu_mode () paravirt_ops.set_lazy_mode(PARAVIRT_LAZY_FLUSH)/* These all sit in the .parainstructions section to tell us what to patch. */ struct paravirt_patch {