Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e44dea35 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/vmware' into x86/trampoline

parents 51ea8a88 b0f4c062

Documentation/feature-removal-schedule.txt

+0 −28
Original line number Diff line number Diff line
@@ -386,34 +386,6 @@ Who: Tejun Heo <tj@kernel.org> 


----------------------------



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 <akataria@vmware.com>



----------------------------



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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);