x86/vmware for v2.6.37
Subsystems (5)
Linus,
Please pull the latest x86-vmware-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-vmware-for-linus
Thanks,
Ingo
------------------>
Alok Kataria (2):
x86, vmware: Remove deprecated VMI kernel support x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI
Documentation/feature-removal-schedule.txt | 28 - Documentation/kernel-parameters.txt | 2 +- arch/x86/Kconfig | 19 - arch/x86/include/asm/paravirt.h | 5 - arch/x86/include/asm/paravirt_types.h | 1 - arch/x86/include/asm/vmi.h | 269 --------- arch/x86/include/asm/vmi_time.h | 98 --- arch/x86/kernel/Makefile | 1 - arch/x86/kernel/paravirt.c | 1 - arch/x86/kernel/setup.c | 12 +- arch/x86/kernel/smpboot.c | 2 - arch/x86/kernel/vmi_32.c | 893 ---------------------------- arch/x86/kernel/vmiclock_32.c | 317 ---------- arch/x86/mm/pgtable.c | 4 - arch/x86/xen/mmu.c | 1 - 15 files changed, 5 insertions(+), 1648 deletions(-) delete mode 100644 arch/x86/include/asm/vmi.h delete mode 100644 arch/x86/include/asm/vmi_time.h delete mode 100644 arch/x86/kernel/vmi_32.c delete mode 100644 arch/x86/kernel/vmiclock_32.c
Documentation/feature-removal-schedule.txt +0 -28
@@ -386,34 +386,6 @@ Who: Tejun Heo <[email protected]> ---------------------------- -What: Support for VMware's guest paravirtuliazation technique [VMI] will be - dropped. -When: 2.6.37 or earlier. -Why: With the recent innovations in CPU hardware acceleration technologies - from Intel and AMD, VMware ran a few experiments to compare these - techniques to guest paravirtualization technique on VMware's platform. - These hardware assisted virtualization techniques have outperformed the - performance benefits provided by VMI in most of the workloads. VMware - expects that these hardware features will be ubiquitous in a couple of - years, as a result, VMware has started a phased retirement of this - feature from the hypervisor. We will be removing this feature from the - Kernel too. Right now we are targeting 2.6.37 but can retire earlier if - technical reasons (read opportunity to remove major chunk of pvops) - arise. - - Please note that VMI has always been an optimization and non-VMI kernels - still work fine on VMware's platform. - Latest versions of VMware's product which support VMI are, - Workstation 7.0 and VSphere 4.0 on ESX side, future maintainence - releases for these products will continue supporting VMI. - - For more details about VMI retirement take a look at this, - http://blogs.vmware.com/guestosguide/2009/09/vmi-retirement.html - -Who: Alok N Kataria <[email protected]> - ----------------------------- - What: Support for lcd_switch and display_get in asus-laptop driver When: March 2010 Why: These two features use non-standard interfaces. There are the
Documentation/kernel-parameters.txt +1 -1
@@ -455,7 +455,7 @@ and is between 256 and 4096 characters. It is defined in the file [ARM] imx_timer1,OSTS,netx_timer,mpu_timer2, pxa_timer,timer3,32k_counter,timer0_1 [AVR32] avr32 - [X86-32] pit,hpet,tsc,vmi-timer; + [X86-32] pit,hpet,tsc; scx200_hrt on Geode; cyclone on IBM x440 [MIPS] MIPS [PARISC] cr16
arch/x86/Kconfig +0 -19
@@ -517,25 +517,6 @@ if PARAVIRT_GUEST source "arch/x86/xen/Kconfig" -config VMI - bool "VMI Guest support (DEPRECATED)" - select PARAVIRT - depends on X86_32 - ---help--- - VMI provides a paravirtualized interface to the VMware ESX server - (it could be used by other hypervisors in theory too, but is not - at the moment), by linking the kernel to a GPL-ed ROM module - provided by the hypervisor. - - As of September 2009, VMware has started a phased retirement - of this feature from VMware's products. Please see - feature-removal-schedule.txt for details. If you are - planning to enable this option, please note that you cannot - live migrate a VMI enabled VM to a future VMware product, - which doesn't support VMI. So if you expect your kernel to - seamlessly migrate to newer VMware products, keep this - disabled. - config KVM_CLOCK bool "KVM paravirtualized clock" select PARAVIRT
arch/x86/include/asm/paravirt.h +0 -5
@@ -416,11 +416,6 @@ static inline void paravirt_alloc_pmd(struct mm_struct *mm, unsigned long pfn)PVOP_VCALL2 (pv_mmu_ops.alloc_pmd, mm, pfn); } -static inline void paravirt_alloc_pmd_clone (unsigned long pfn,unsigned long clonepfn, -unsigned long start,unsigned long count) -{ -PVOP_VCALL4 (pv_mmu_ops.alloc_pmd_clone, pfn, clonepfn, start, count); -}static inline void paravirt_release_pmd (unsigned long pfn) {PVOP_VCALL1 (pv_mmu_ops.release_pmd, pfn);
arch/x86/include/asm/paravirt_types.h +0 -1
@@ -255,7 +255,6 @@ struct pv_mmu_ops {*/ void (*alloc_pte)(struct mm_struct *mm,unsigned long pfn);void (*alloc_pmd)(struct mm_struct *mm,unsigned long pfn); -void (*alloc_pmd_clone)(unsigned long pfn,unsigned long clonepfn,unsigned long start,unsigned long count);void (*alloc_pud)(struct mm_struct *mm,unsigned long pfn);void (*release_pte)(unsigned long pfn);void (*release_pmd)(unsigned long pfn);
arch/x86/include/asm/vmi.h deleted +0 -269
269 lines not on this page · raw message
arch/x86/include/asm/vmi_time.h deleted +0 -98
98 lines not on this page · raw message
arch/x86/kernel/Makefile +0 -1
@@ -91,7 +91,6 @@ obj-$(CONFIG_K8_NB) += k8.o obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o obj-$(CONFIG_DEBUG_NX_TEST) += test_nx.o -obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o obj-$(CONFIG_KVM_GUEST) += kvm.o obj-$(CONFIG_KVM_CLOCK) += kvmclock.o obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
arch/x86/kernel/paravirt.c +0 -1
@@ -413,7 +413,6 @@ struct pv_mmu_ops pv_mmu_ops = { .alloc_pte = paravirt_nop, .alloc_pmd = paravirt_nop, - .alloc_pmd_clone = paravirt_nop, .alloc_pud = paravirt_nop, .release_pte = paravirt_nop, .release_pmd = paravirt_nop,
arch/x86/kernel/setup.c +4 -8
@@ -83,7 +83,6 @@#include <asm/dmi.h> #include <asm/io_apic.h> #include <asm/ist.h> -#include <asm/vmi.h> #include <asm/setup_arch.h> #include <asm/bios_ebda.h> #include <asm/cacheflush.h>
@@ -734,10 +733,10 @@ void __init setup_arch(char **cmdline_p)printk (KERN_INFO "Command line: %s\n" , boot_command_line);#endif -/* VMI may relocate the fixmap; do this before touching ioremap area */ -vmi_init (); - -/* OFW also may relocate the fixmap */ +/* +* If we have OLPC OFW, we might end up relocating the fixmap due to +* reserve_top(), so do this before touching the ioremap area. +*/ olpc_ofw_detect ();early_trap_init ();
@@ -838,9 +837,6 @@ void __init setup_arch(char **cmdline_p)x86_report_nx (); -/* Must be before kernel pagetables are setup */ -vmi_activate (); -/* after early param, so could get panic from serial */ reserve_early_setup_data ();
arch/x86/kernel/smpboot.c +0 -2
@@ -62,7 +62,6 @@#include <asm/pgtable.h> #include <asm/tlbflush.h> #include <asm/mtrr.h> -#include <asm/vmi.h> #include <asm/apic.h> #include <asm/setup.h> #include <asm/uv/uv.h>
@@ -311,7 +310,6 @@ notrace static void __cpuinit start_secondary(void *unused)__flush_tlb_all ();#endif -vmi_bringup ();cpu_init ();preempt_disable ();smp_callin ();
arch/x86/kernel/vmi_32.c deleted +0 -893
893 lines not on this page · raw message
arch/x86/kernel/vmiclock_32.c deleted +0 -317
317 lines not on this page · raw message
arch/x86/mm/pgtable.c +0 -4
@@ -98,10 +98,6 @@ static void pgd_ctor(pgd_t *pgd)clone_pgd_range (pgd +KERNEL_PGD_BOUNDARY , swapper_pg_dir +KERNEL_PGD_BOUNDARY ,KERNEL_PGD_PTRS ); -paravirt_alloc_pmd_clone (__pa (pgd) >>PAGE_SHIFT , -__pa (swapper_pg_dir) >>PAGE_SHIFT , -KERNEL_PGD_BOUNDARY , -KERNEL_PGD_PTRS ); }/* list required to sync kernel mapping updates */
arch/x86/xen/mmu.c +0 -1
@@ -1969,7 +1969,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { .alloc_pte = xen_alloc_pte_init, .release_pte = xen_release_pte_init, .alloc_pmd = xen_alloc_pmd_init, - .alloc_pmd_clone = paravirt_nop, .release_pmd = xen_release_pmd_init,#ifdef CONFIG_X86_64